Skip to content
Commit 1ac51840 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

Change-Id: I8fdb25956710600d75a0f2eb0bbf82a94fc78131
parents 8f919b8c 22f4a681
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