OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev
authorBeverly Tai <beverlyt@google.com>
Tue, 12 Sep 2017 14:11:10 +0000 (14:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 14:11:10 +0000 (14:11 +0000)
commit3ca0cc0ae6b394bf5f744eb5a61966835f2461f2
tree4466b0ee6c23d3db9a7ab320a9da9fae6c29e9e9
parent4973227cbf4a0626d396a74ce115554f7fa4f07d
parente1adf2240f6218a2c4eb2c3e853db8c5b685dcab
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev
am: e1adf2240f  -s ours

Change-Id: I02b0df60257429b5f2ed4ce2f0f4ee817abf585c