OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorGeoff Mendal <mendal@google.com>
Wed, 23 Mar 2016 14:35:01 +0000 (14:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 14:35:01 +0000 (14:35 +0000)
commitb05ee1ba35443cb25ffab38c9fd952d2f733a450
tree4d3e7ab12a72a0bb6b8d4712c6206b56458f04f5
parent7bd095722ace338e5c103057afe2a269760e6890
parentb5685764727d93ff2e6dd59249464dded120947f
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b568576  -s ours

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