OSDN Git Service

Merge "Update string for not charging." into oc-mr1-dev am: ed0c5cf48f
authorjackqdyulei <jackqdyulei@google.com>
Tue, 8 Aug 2017 19:42:54 +0000 (19:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 19:42:54 +0000 (19:42 +0000)
commite685cc06a81e4e91d2f9566c094b8c4829c073a7
tree33f1e35ea5e852ced758c1878f21fdf8db0101be
parent06ae9c665b6fce7a748c3d7175359bff8343768c
parent205afa7bd6ee2912b2db86934531631abd5383bf
Merge "Update string for not charging." into oc-mr1-dev am: ed0c5cf48f
am: 205afa7bd6

Change-Id: I5b669558511845402fbda458c748dce1c931733f