OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Sun, 22 May 2016 23:34:35 +0000 (23:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 22 May 2016 23:34:35 +0000 (23:34 +0000)
commit9283938bc7b05fab54f01e5d53d72021bb80101f
treea6859334cafbf4e5bd2e3367af9f6bac9362612a
parent453a967a0c6dbd6e3442f7fe406e04ae759aab19
parent7533f3260e888c6edc709b02eafdb5722172ecc2
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7533f3260e  -s ours

* commit '7533f3260e888c6edc709b02eafdb5722172ecc2':
  Import translations. DO NOT MERGE

Change-Id: I8bb034309c4319df4caa65ae7b8124cb49ccb414