diff options
author | Beverly Tai <beverlyt@google.com> | 2017-10-19 01:23:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 01:23:57 +0000 |
commit | 01ae44596670e0c869a3fc6878d5ab9ea1b54e73 (patch) | |
tree | fe35ca643838769dd856507bdc0ac0ebe21459ef | |
parent | dcdb0e6bbe940076a8e3953ecd2f78a4bf1dde18 (diff) | |
parent | 3ca0cc0ae6b394bf5f744eb5a61966835f2461f2 (diff) | |
download | base-01ae44596670e0c869a3fc6878d5ab9ea1b54e73.tar.gz |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f -s ours
am: 3ca0cc0ae6 -s ours
Change-Id: Id5662a7d789e3e17e365d99b439cc8e8ab5d1c37
0 files changed, 0 insertions, 0 deletions