| commit | a9d3b4d80676abe828014dbf48bca5266f8d7496 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Thu Oct 19 03:34:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 03:34:46 2017 +0000 |
| tree | 1a94d2393748b061aada9d5abe1fb58710874212 | |
| parent | b614e5560e67f0d3ba93e77839ddf8a99747aa3e [diff] | |
| parent | 1ce0456b99918e5dee71e0fbfb88d6999c046aaf [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 am: 93d9ac257d -s ours am: 1ce0456b99 Change-Id: I9650a76a4f2dacb2c37e8232409e03c8745383f7