OSDN Git Service

am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv...
authorTim Kilbourn <tkilbourn@google.com>
Fri, 14 Mar 2014 23:37:55 +0000 (23:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 23:37:55 +0000 (23:37 +0000)
* commit '42dd0bb6b506be81c76cffc7b6f5491c937d4e07':
  FEATURE_LEANBACK implies that the device is a tv.


Trivial merge