| commit | 4c281167d7144c73d30e69e48cd97bbf95f06b69 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Thu Sep 14 18:44:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 14 18:44:46 2017 +0000 |
| tree | c9f901d89a1848d75d6d0cf788b2ba85fca80b5a | |
| parent | 024a096e22c44706426555229cd7e07c339aa2f8 [diff] | |
| parent | 2dfb1bab8dfd17f0f989693c269dd023fd40347a [diff] |
Merge "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 am: b237ea7cc8" into oc-mr1-dev am: 2dfb1bab8d Change-Id: Ibceb50b184f18164e6e3203f43c16ac267d83826