tree 4c1869d1fa1ca59737abc8a8f86a40ea04ee3fb6
parent a75fa912472f4fa0998356c65b299e71cf6a453f
parent 89a055aa9d04bf81b10e793c638a5b26291d9ee7
author Jerry Zhang <zhangjerry@google.com> 1479341579 +0000
committer android-build-merger <android-build-merger@google.com> 1479341579 +0000

Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
am: 89a055aa9d

Change-Id: I8bad2864a848b46c99e2693acacb320615338ec8