tree c151617f1647ce498a2b1a91ace11e5e5d744ca2
parent 6352ced6353220f847818ae55d0bd24e6c29a07b
parent d0d0fea3d6b032c460dc26e5b250b61bed88718c
author Beverly Tai <beverlyt@google.com> 1505232096 +0000
committer android-build-merger <android-build-merger@google.com> 1505232096 +0000

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours
am: d0d0fea3d6

Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf