OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 03:58:35 +0000 (03:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 03:58:35 +0000 (03:58 +0000)
commitea0b574ea52a875359bb545a8c6e3245d676bb96
tree5cf35302d2a2222577f676df928f1247e1e6c08d
parent1d1aac8621aecbbb2d0fd4795246a487e44a41be
parenta9d3b4d80676abe828014dbf48bca5266f8d7496
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

Change-Id: Id867bdf6b1756dd2a1cf8a9229d61125aeccf463