OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 4 Aug 2016 09:41:10 +0000 (09:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 09:41:10 +0000 (09:41 +0000)
commitfd2baea4b8047e62a686924c01e9b480e373ed09
tree11f77a90a8d56d6925b2353e1785bcbd99556abc
parenta9ad38d3a5c204570fddcce63bad776d22ffafe1
parentdfe576b3e47ce69ba7b4a3055c8593042d491a74
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: dfe576b3e4  -s ours

Change-Id: If528ff620a5250c512f182108bc02b8b4088bf7b