| commit | 3b048905d6cc1752a5541de0579fa9db3c6f5d60 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Tue Sep 12 17:27:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 12 17:27:18 2017 +0000 |
| tree | 16ef16586b2292e4360a97af1ec444b6807345ec | |
| parent | 13ca88dbf6ee728a66a80666eacf5c4cf7b90403 [diff] | |
| parent | 517bb6eaa60147a8434c7af45e6ce96a1bb80a84 [diff] |
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 Change-Id: I8d89c0f195d37c1588fd7e1a77fcd97fb97fc775