OSDN Git Service

Merge "Revert string change" into oc-dr1-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)
commitd6ab7dee092abcfbefd6d5778be854c461bb29d0
treeaf02e177b5def74bb6b267664dee84d11103701e
parent97ca7e473a71db621672a3596e3727faa1c3654e
parent4b8f2c9ad51f489514ecaf047f7c890b9f3c2a96
Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5

Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
res/values/strings.xml