OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 14:43:40 +0000 (14:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 14:43:40 +0000 (14:43 +0000)
commit9a74d618c2055f0e02e2d6b57745fa021a87b997
treed1be39dbf521b7d0e6fe23c3e6ad086725bf7552
parentb4913b709311d3897b86a2e2e4e5338dd07f2f4b
parentb004901c9227e6fe3cad12f2f46055f385499fac
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908  -s ours
am: b004901c92

Change-Id: I528ac97ec904ce789b50bde5e8174d81c85d5e1b