OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorGeoff Mendal <mendal@google.com>
Wed, 23 Mar 2016 14:34:59 +0000 (14:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 14:34:59 +0000 (14:34 +0000)
commit7bd095722ace338e5c103057afe2a269760e6890
tree4d3e7ab12a72a0bb6b8d4712c6206b56458f04f5
parentcb46f05e6aac60a6e6db9946d9b674a54b2e49fa
parentfcdf51ced4dc61aa379f51ad9c2f579bf11b68fe
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: fcdf51c  -s ours

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