| commit | b237ea7cc87c2c632edf23ae28e6a757422ada14 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Thu Sep 14 18:11:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 14 18:11:18 2017 +0000 |
| tree | 0d78f4d427601aef02fe3b946c3fb7114a3b3a6b | |
| parent | c3e2d40309ca337290092181e955a5a8f2838030 [diff] | |
| parent | 9bc160cc3d9724ef692d130e699fd857d717815e [diff] |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3 -s ours am: 26e84466d3 -s ours am: 9bc160cc3d Change-Id: Ib152e64e01f43f3a6fb1df6c749e4f83566266b5