tree 45e9e05a30264b937d003dccb80c1759a0b063dd
parent 9857eb58da2eb25d9b82d7e420d0a50a45048626
parent ae86706b68e2da5201cf9ab718c59c3f6c65cd13
author Beverly Tai <beverlyt@google.com> 1505237907 +0000
committer android-build-merger <android-build-merger@google.com> 1505237907 +0000

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: 108e142d61
am: ae86706b68  -s ours

Change-Id: I68dbff15a630e518c2500ae4c8d8b8bfc9e3a83e