OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 21 Jun 2017 19:56:07 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 19:56:07 +0000 (19:56 +0000)
commit4b209f21b647645d0013878637749f6c187fa230
tree63f872fbd2f9f896e4b8d4312ce3e96b0e17603b
parent024ba8960649844c7635defd881a76afeeca5c61
parent242c3c497c3b79be844713cbe7280f19ddd9f711
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 242c3c497c  -s ours

Change-Id: Iaa7d2555bdcab5be052515f8f5d9c5c38360b4e9