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

Change-Id: I6bbcdf36c8f550699ad5123b1b08c30d4fff0570
This commit is contained in:
Beverly Tai
2017-09-12 16:57:46 +00:00
committed by android-build-merger

Diff Content Not Available