tree 62a5e3f6fe7528059efffdcb4dd2f83b667df4e0
parent 8621a28b04dc488763e21ecd65f24b37310b78cb
parent 7fd4bec14aaf0e3d30eb6546ef7501d38a76d32d
author Beverly Tai <beverlyt@google.com> 1508381303 +0000
committer android-build-merger <android-build-merger@google.com> 1508381303 +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
am: 7fd4bec14a

Change-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f