tree 9ea86adf4b5f09195f56560b94f9a27db20339e7
parent 9950579eb5f6adcee14fc35bbc6bdee9535df3b6
parent c6ca9254ed07ff129a4d26c5601f5ebc462ca8dd
author Beverly Tai <beverlyt@google.com> 1508380639 +0000
committer android-build-merger <android-build-merger@google.com> 1508380639 +0000

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509  -s ours am: f1a95220a3
am: c6ca9254ed

Change-Id: I8715d787f890827442c098b7ef5c93c563e4246e