| commit | 071443e9332ae8c4d69452a768b59db747eb3fdf | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Sep 12 17:29:11 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 12 17:29:11 2017 +0000 |
| tree | 16ef16586b2292e4360a97af1ec444b6807345ec | |
| parent | ae86706b68e2da5201cf9ab718c59c3f6c65cd13 [diff] | |
| parent | 3b048905d6cc1752a5541de0579fa9db3c6f5d60 [diff] |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours am: ff5a0512ec am: 0392ba5f72 am: 517bb6eaa6" into oc-mr1-dev-plus-aosp