Skip to content
Commit f2ffcd64 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:... 

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

Change-Id: I52f02086bc92ac347249e935697fadcf6fb4c410
parents 82c264e0 5a26231e
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