OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)
commitb6ecd1f88a6fc6a7fe807aa94a4d9aba03c582cd
tree9519e8bb3ef2f992db905fcc6b303c5038b49f9d
parent14164f1bdf17639bf32535c6e27c12ec3d613ec0
parent260ef208accffe768143cdab117c186917bcb03f
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1
am: 260ef208ac  -s ours

Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876