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:38:39 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 18:38:39 +0000 (18:38 +0000)
commite082f857d35ba5077655eb7869b7fdcec22461da
treea6796f7b2d387ccc2762e55a1664ca2d577ec374
parent7860f1cd787c55c87070c6c845842fcebebd553e
parent98e46b5bd8d314667038a1d6f3bbbbcd4334fc89
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
am: 98e46b5bd8

Change-Id: I3051278fb2cb8f9bc470464cabf0150d91e752c4