Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d am: 1451a4af78 am: 3473bc219e
am: 0a098f377c
Change-Id: I6cbd7a530b1f4ef8198990da6cb2d00bd92554fb
This commit is contained in: