OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 15:22:09 +0000 (15:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 15:22:09 +0000 (15:22 +0000)
commit2058da0e272a672dd83d6adb22816ee141a4e758
treef7d3a4383e5ad836626dd3bfec2cae7b255f29cc
parent2919a6e6d3864cbdadecbe1aa85cdb986a68ff6a
parent60b9835e7d140dcc8627ef834215d48f62139137
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d  -s ours am: 1ce0456b99 am: a9d3b4d806 am: ea0b574ea5
am: 60b9835e7d  -s ours

Change-Id: Ie97dd3b28cc068043f66311381750f6e07e66100