commit | bb7fc483f06fc4b95d6c41f619acfbf939e208d5 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Thu Sep 14 18:17:48 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 14 18:17:48 2017 +0000 |
tree | 9ea3af01e343fd5e14e458d55df6766a032c1308 | |
parent | ba4b1cdcffb6d3b5280e0c59ec4861a9c5c2ab98 [diff] | |
parent | c3e2d40309ca337290092181e955a5a8f2838030 [diff] |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours am: 95e10b296e am: c3e2d40309 Change-Id: I2376a371a5b4e5e29155dff85054b5620dfd2fa6