OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 18:27:56 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 18:27:56 +0000 (18:27 +0000)
commit98e46b5bd8d314667038a1d6f3bbbbcd4334fc89
treef2f4103ac42a3eea7b66bd27da7569d0970ccd53
parentd0c9f402d50c84b5498faa1262418403ab379e35
parentb237ea7cc87c2c632edf23ae28e6a757422ada14
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3  -s ours am: 26e84466d3  -s ours am: 9bc160cc3d
am: b237ea7cc8

Change-Id: I04d50fa8ed1d66b706f5a5497543bc6b01aa1d8a