| commit | c6ca9254ed07ff129a4d26c5601f5ebc462ca8dd | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Thu Oct 19 02:25:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 02:25:35 2017 +0000 |
| tree | e19bd5687deca48bb98ab968aa64afa9aed45b47 | |
| parent | 19a3c53841e321ca195510c7421a2a91f060d600 [diff] | |
| parent | f1a95220a3653eee062f585bef9c184748213069 [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 Change-Id: Icccff07eedee53fdc20c40d62e41b40af0b4992f