Commits
Jose Lima authored and Android Git Automerger committed 485f6a60e01M
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 * commit '4a40f7cc90d8f908527d2cfff32376ee51259250': Fix crash caused by disabling the Options panel on TVs
Showing diff to1334d5cfb4e