OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 19:00:40 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 19:00:40 +0000 (19:00 +0000)
commitfe5ce91c5fff023e38395b0b4c559c6dabc21163
tree0d78f4d427601aef02fe3b946c3fb7114a3b3a6b
parentb237ea7cc87c2c632edf23ae28e6a757422ada14
parentd740b2d09aa50277d2e6585f76d579bbdabc6f7c
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
am: d740b2d09a  -s ours

Change-Id: I952391f1801cd678240b145971a733c755f62078