tree 2b4ea2c535f793a32cf2f6c5e1928a6357cf28e1
parent 8e72aa8a41cf1395ce30a9f0c9416587d64b5ba9
parent 445768bddf00256195a46b78ed35ea3722df7c92
author Jose Lima <joselima@google.com> 1422328228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422328228 +0000

am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev

* commit '445768bddf00256195a46b78ed35ea3722df7c92':
  Allow disabling the Options Pannel feature for TVs