tree 9bd8b076e19034ee9c07ad53310fac74e4d03702
parent 77c982f28b8d1128d6bec0fcc814f4ec818576bd
parent 1fa3f2a9d007539e3b3113f0ef949eff96cf689e
author Beverly Tai <beverlyt@google.com> 1508386524 +0000
committer android-build-merger <android-build-merger@google.com> 1508386524 +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 am: b00fd6bb97 am: 93d9ac257d  -s ours am: 1ce0456b99 am: a9d3b4d806
am: 1fa3f2a9d0

Change-Id: I2847d3a98f87781d601406283a6909f55fe0db82