tree b162d1c8879352418eda84dfe27873c25392a953
parent 30260c7e93fa5d5a08c505e1b804849bb56b83f1
parent 9539b4a02f74b447db0e3aa1039229f6b913aa87
author Tim Kilbourn <tkilbourn@google.com> 1394839991 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394839991 +0000

am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit '9539b4a02f74b447db0e3aa1039229f6b913aa87':
  FEATURE_LEANBACK implies that the device is a tv.