tree 61b13a56d41c9952fd89e3abcac47fdb42162dc9
parent 72d34983a38db56c5db3bc1d45bff08d35efe88e
parent 8b6614cdc36be399ed3963327ea7b7b67dda3a95
author Jerry Zhang <zhangjerry@google.com> 1485380140 +0000
committer android-build-merger <android-build-merger@google.com> 1485380140 +0000

Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev am: 361a3e2090
am: 8b6614cdc3

Change-Id: I3162421f2f3e5a6237166d200feb7f954968f9f1