OSDN Git Service

Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
authorSujith Ramakrishnan <sujithrk@google.com>
Thu, 29 Jun 2017 18:59:07 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 18:59:07 +0000 (18:59 +0000)
am: 564d0bf1be

Change-Id: I1cd59a2966f692a4857343e21bf1586719939490


Trivial merge