commit | 1ce0456b99918e5dee71e0fbfb88d6999c046aaf | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Thu Oct 19 03:06:40 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 03:06:40 2017 +0000 |
tree | 9519e8bb3ef2f992db905fcc6b303c5038b49f9d | |
parent | 65f1a4c4c2f03fdd49a277048ac2446c9c9f47d4 [diff] | |
parent | 93d9ac257db022426e19e60fa71c14daadb52297 [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 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours Change-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6