Skip to content
Commit 2484a7c2 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 mnc-dr-dev am: 8150eb82 am: 97b98a3b am: d54bc6a9  -s ours am: b004901c am: 9a74d618 am: 0bf81b63 am: e148e39d am: a126d948  -s ours am: 2435c816 am: a62951f2 am: 6d23578d" into oc-mr1-dev-plus-aosp
am: 1a2c28c9  -s ours

Change-Id: I798f105f4a8f124340dc92e407972b32d18b0030
parents 7a6ab972 1a2c28c9
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