OSDN Git Service

resolved conflicts for merge of 1adca55f to mnc-dr-dev
authorJason Monk <jmonk@google.com>
Tue, 4 Aug 2015 20:23:32 +0000 (16:23 -0400)
committerJason Monk <jmonk@google.com>
Tue, 4 Aug 2015 20:23:32 +0000 (16:23 -0400)
commit9824c5da1efa9750fb19d477d29875a08289ecf5
tree7181d78cfb1c5c50bf9c7c20ce7aa3422da14d48
parent2e3775b9b143311da66b91c6f1291a4639236d07
parent1adca55ffe10f1741e5fb75bf0e7530ca200d712
resolved conflicts for merge of 1adca55f to mnc-dr-dev

Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
src/com/android/settings/deviceinfo/UsbBackend.java
src/com/android/settings/deviceinfo/UsbModeChooserActivity.java