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

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev 

am: f2b59272  -s ours

Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0
parents 159648d6 f2b59272
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