| commit | 1ac5184053cdd90a78400291288655ca877bca25 | [log] [tgz] |
|---|---|---|
| author | Badhri Jagan Sridharan <badhri@google.com> | Fri Jan 12 19:22:13 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 12 19:22:13 2018 +0000 |
| tree | 7864c8885c699be79018866f8f3d8118ffd84ca4 | |
| parent | 8f919b8c5beba271b12e138f5bab9c6c9ead83dc [diff] | |
| parent | 22f4a681f94f0b1159249ba9120af9b439758ee9 [diff] |
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am: 22f4a681f9 -s ours Change-Id: I8fdb25956710600d75a0f2eb0bbf82a94fc78131