OSDN Git Service

Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
authorSongFerng Wang <songferngwang@google.com>
Mon, 14 Oct 2019 07:34:20 +0000 (00:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Oct 2019 07:34:20 +0000 (00:34 -0700)
commit951e9b7742d4ae82baad953e379a4b90966e9d2b
tree326cc836a61a6edbdf4696111226abc449837e61
parent10d41f52b777d31938856073629f30e9fab7af53
parentbc6a65ca32049410bf4f36c636560a806d3cd6a4
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
am: bc6a65ca32

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