OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 18:34:53 +0000 (18:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 18:34:53 +0000 (18:34 +0000)
am: d0c9f402d5

Change-Id: Id0e718caf1663ff8e7c27a7b39a795dd8d3afc37


Trivial merge