OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 12 Apr 2017 20:27:30 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 20:27:30 +0000 (20:27 +0000)
commit8c53d24399c90bd0b96b4b67c005fcf57b79c706
tree89df5ef658c31b404efa67a26b6b2ba43a0a07c4
parent455b742bb6b151dba38c68fe9ada8c90df347106
parent88ab6c1304e3f9a2b1d96deece34bb7cbec27d8f
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 88ab6c1304  -s ours

Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc