commit | 4bdddadcc595b87b2fef441258e73a0c30970305 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Tue Sep 12 16:41:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 12 16:41:18 2017 +0000 |
tree | 95334daac13098d6bcadf306e91b76b724f3054a | |
parent | 4d91e69c82a7550fc46185a66b7d2fe0757d18ab [diff] | |
parent | 6cd11423600f7e87f6f0463f87ab28ae177c104b [diff] |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 Change-Id: I1f5c3e90eb7cc9679d54699d2ead567e4db6c789