tree 9333096b118a0dfcb4706abd4fcc6d0542495583
parent 13d5f053505adccac111a7fba7e900a02d0dcba9
parent 564d0bf1bee6276fa347a948c3d91eca1fdc5ee4
author Sujith Ramakrishnan <sujithrk@google.com> 1498762751 +0000
committer android-build-merger <android-build-merger@google.com> 1498762751 +0000

Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am: 564d0bf1be

Change-Id: I23deb9056dbd9967bfe07d3db30256794b30a778