Skip to content
Commit 5a26231e authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am: 22f4a681 -s ours 

am: 1ac51840

Change-Id: I9dc40770783686b9b3db57275c8a1bbab97a7a9a
parents 09448891 1ac51840
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