| commit | 93d9ac257db022426e19e60fa71c14daadb52297 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Thu Oct 19 02:59:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 02:59:41 2017 +0000 |
| tree | 2a11afc6708a91bb49c2bd8f5dec6d0fade7d5a7 | |
| parent | 685b515140c16f78ab17f9530d31420939b68c0a [diff] | |
| parent | b00fd6bb97941d0f154bc479b110ca54a2d0cb7d [diff] |
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 Change-Id: Ie1ed5edaabe4cf6206764c0f343a70eb588009c5