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:00:15 +0000 (18:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 18:00:15 +0000 (18:00 +0000)
commit9bc160cc3d9724ef692d130e699fd857d717815e
treeafcb1b167f48adb6d377c2ec134a5bdc617f899b
parent95e10b296e3eff3d5e21c9fbb07cdd152d815865
parent26e84466d3ef09e7976b0c63ea59e2cf3fd8d6e4
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3  -s ours
am: 26e84466d3  -s ours

Change-Id: I8564ca1d5f7c185bd6eedd0ee23adbefa9a421e0