OSDN Git Service

am 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for...
authorJason Monk <jmonk@google.com>
Tue, 4 Aug 2015 18:23:57 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 18:23:57 +0000 (18:23 +0000)
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
  Update USB dialog for USB-C power option

1  2 
res/values/strings.xml

Simple merge