OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorGeoff Mendal <mendal@google.com>
Wed, 23 Mar 2016 14:49:29 +0000 (14:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 14:49:29 +0000 (14:49 +0000)
commit5ac3c33b8b3f20822a79b9a2c88f33b34f5bebb1
tree4d3e7ab12a72a0bb6b8d4712c6206b56458f04f5
parentb05ee1ba35443cb25ffab38c9fd952d2f733a450
parentdf1e2b1457690ccbd1302078cedafbfbb8918265
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: df1e2b1  -s ours

* commit 'df1e2b1457690ccbd1302078cedafbfbb8918265':
  Import translations. DO NOT MERGE