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)
commit7860f1cd787c55c87070c6c845842fcebebd553e
treea6796f7b2d387ccc2762e55a1664ca2d577ec374
parent4fc8f1f9b41d7dce4c448f9f2cffca9cb5172eb0
parentd0c9f402d50c84b5498faa1262418403ab379e35
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7  -s ours am: 95e10b296e am: c3e2d40309
am: d0c9f402d5

Change-Id: Id0e718caf1663ff8e7c27a7b39a795dd8d3afc37