commit | 5a26231e392a51c6aa9e1a01ff52559777552854 | [log] [tgz] |
---|---|---|
author | Badhri Jagan Sridharan <badhri@google.com> | Fri Jan 12 19:36:56 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 12 19:36:56 2018 +0000 |
tree | 94288608d1ae9bc15451a2beb25016659a8d44cb | |
parent | 094488916426bc74a8d567ec19bece037a3afbf3 [diff] | |
parent | 1ac5184053cdd90a78400291288655ca877bca25 [diff] |
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am: 22f4a681f9 -s ours am: 1ac5184053 Change-Id: I9dc40770783686b9b3db57275c8a1bbab97a7a9a