OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:42:18 +0000 (03:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:42:18 +0000 (03:42 +0000)
am: 09af2a1032  -s ours

Change-Id: Iacb267f7fb77bc555cbd537df6471f0b9c7a0007


Trivial merge