tree d6167e517805f448fef372507aaaad307ef0759f
parent f0561142f3b7ddd85947d7ee268d5b98a39489b9
parent 7ca5d3a334ce1bd16360cef14889f44829bf8208
author Badhri Jagan Sridharan <badhri@google.com> 1515771368 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1515771368 +0000

Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"