OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Sun, 22 May 2016 23:26:51 +0000 (23:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 22 May 2016 23:26:51 +0000 (23:26 +0000)
commita2ff3943b2203a82978ad7116a44b646f02a88a4
treea6859334cafbf4e5bd2e3367af9f6bac9362612a
parent5cb9547cb7dfd761cb251faba9774480bb70063c
parent24708d9c8e54701d6c3ee20f72e8dfb09d0f5c75
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 24708d9c8e  -s ours

* commit '24708d9c8e54701d6c3ee20f72e8dfb09d0f5c75':
  Import translations. DO NOT MERGE

Change-Id: Id96597e05d8bb1b74a9290445f76c0b645e238b3