commit | f1a95220a3653eee062f585bef9c184748213069 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Thu Oct 19 02:09:14 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 02:09:14 2017 +0000 |
tree | fbb0f18b72dc8626f8d88a887e41ad2502eebf14 | |
parent | 69cc90b01cd125265856b27f149200b880c7c580 [diff] | |
parent | 9b0a6a350932bef191740807101a4e107efbc888 [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 Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5