Skip to content
Commit a8a8d475 authored by Beverly Tai's avatar Beverly Tai Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution."... 

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b59272  -s ours am: dfbaa1fd am: d7ece4da am: 06bd19c1 am: 7b1157a9  -s ours am: bcdb9079 am: 5fda53b2 am: 791d8a5b am: 4dd01948 am: 260ef208  -s ours am: b6ecd1f8 am: f2e1ef22" into oc-dr1-dev-plus-aosp
am: a6b9a27c

Change-Id: I22b9c537fb0f5e1b1414be25f20b6710d00e2f90
parents 0af34ddf a6b9a27c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment