tree 4e1491e3b6e1a1c47424e38a840b06a4facd3099
parent d4031658b0beb96e24037d485c2c30e4fea6c7bc
parent 30b9adfad1c5055044f0b585782b10f764e0ddf9
author Jerry Zhang <zhangjerry@google.com> 1515547803 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1515547803 +0000

Merge "Add setScreenUnlockedFunctions method to UsbManager"