Skip to content
Commit 95e10b29 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 nyc-mr2-dev 

am: 121d3b89  -s ours

Change-Id: I91cb627a007c03660d41b0a01d3de71165373ff1
parents ef696aa4 121d3b89
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