tree f9da65f153e972decaf75af8edc37a2173a9b9d5
parent bc3e4e7a4a04c19a663263d8303559b11caed3ea
parent c2b8df82d701eb3508da06f75b2201c3f9796373
author Tim Kilbourn <tkilbourn@google.com> 1394843084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394843084 +0000

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

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