am 40bcd1f1: merge in master-release history after reset to 74093917329681f7480a46366...
authorThe Android Automerger <android-build@google.com>
Fri, 23 May 2014 18:22:18 +0000 (18:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 May 2014 18:22:18 +0000 (18:22 +0000)
commitc85dfef77aafabb938f24fe6b805bea82dd5f162
tree8207458e7a6543d752c4ba8e29dd342142de5fe5
parentfd2dd4652a73cfb9582e0d9190c229b2607d737b
parent40bcd1f133f6bd6042fba39068ab7934f0ff2444
am 40bcd1f1: merge in master-release history after reset to 74093917329681f7480a46366972b373004bd8ce

* commit '40bcd1f133f6bd6042fba39068ab7934f0ff2444':
  Remove LatinIME from TV builds.