commit | d0c9f402d50c84b5498faa1262418403ab379e35 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Thu Sep 14 18:18:48 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 14 18:18:48 2017 +0000 |
tree | f2f4103ac42a3eea7b66bd27da7569d0970ccd53 | |
parent | 8ee7f6a5b77884fd51c5825cc8d8d1f32e98991a [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: Ie07e84bbb31df780b8366d63bd364368a24b9134