OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 12 Jul 2016 16:27:38 +0000 (16:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:27:38 +0000 (16:27 +0000)
commit5cca76e7e662cd0d0e60971ed48fe81f60fb9cf2
treebbb9073f5bfe9b67d4f1fbd8f1f4bb831bad5e67
parent1d336cf569b728969c675eca9bb64ee642af83d8
parenta8b4e7320a2b6f6f6e234b5b195441e0fb5e3a47
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: a8b4e7320a  -s ours

Change-Id: Ia3155124b7367bfec936160db2ce5fbc14ae6cb1