Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev

am: d740b2d09a  -s ours

Change-Id: I952391f1801cd678240b145971a733c755f62078
This commit is contained in:
Beverly Tai
2017-09-14 19:00:40 +00:00
committed by android-build-merger

Diff Content Not Available