OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 17 Sep 2016 20:03:32 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Sep 2016 20:03:32 +0000 (20:03 +0000)
commita7be68f24e5960b3a95b34298e60ebf7a536ef1f
treeadd5e38a81e588671cfd26a34e1551ed1d089f0b
parent6915493723e0e7429a921cd3f0e60f73d1384a55
parent6ade653254af107a8818967fe906925884ef0e05
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: 6ade653254  -s ours

Change-Id: I5ad5e3077ce82817a5837e65b06141a21c36af6e