diff options
author | Beverly Tai <beverlyt@google.com> | 2017-10-19 02:03:19 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 02:03:19 +0000 |
commit | 9b0a6a350932bef191740807101a4e107efbc888 (patch) | |
tree | 656d3316792ee40ffec0069be56c9b9db221f0f0 | |
parent | 2bab19f9aaddb7851b98daaf59325b964f1e94d0 (diff) | |
parent | d34366e714216ea06192d563cc9b98a03101cabd (diff) | |
download | base-9b0a6a350932bef191740807101a4e107efbc888.tar.gz |
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
Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81
0 files changed, 0 insertions, 0 deletions