OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 17:44:23 +0000 (17:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 17:44:23 +0000 (17:44 +0000)
commit26e84466d3ef09e7976b0c63ea59e2cf3fd8d6e4
tree686eb43ed670851e4efbde5a8f86aa8309b5b05d
parent121d3b89f71cd769ce19f4af529c1eea98db5a9f
parent68f91528c3965265d0d881586ca0ac908fca6869
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b
am: 68f91528c3  -s ours

Change-Id: Ib051065fc2e83bc001d82f18c9150339842f5e21