tree 92348ca6f04ff180d5ccde8f5cd08ebfd69dfe5c
parent c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460
parent 9873e099c32513cdb28c3ffb8c2306ad87f0b052
author Tim Kilbourn <tkilbourn@google.com> 1394830023 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394830023 +0000

am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev

* commit '9873e099c32513cdb28c3ffb8c2306ad87f0b052':
  Add leanback device features.