OSDN Git Service

Merge "Update misc strings" into oc-mr1-dev
authorFan Zhang <zhfan@google.com>
Wed, 26 Jul 2017 05:02:56 +0000 (05:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 05:02:56 +0000 (05:02 +0000)
commitc2c42de513d54170f54938fd3842e6f1b007f315
treef17b8d9c5a7f8a879dcad55446758ec1a6c7a940
parent99d3b353c67c55327afaac9d9e33fc5fd1f56fcb
parent34d30267e3d4e41cd01baf0078d01a952dc09abc
Merge "Update misc strings" into oc-mr1-dev
am: 34d30267e3

Change-Id: I2d6e173a84ca7c58c6be4785fcd787a052839199