OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Sun, 22 May 2016 23:32:29 +0000 (23:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 22 May 2016 23:32:29 +0000 (23:32 +0000)
commit7458bdbe4a13030990cb175f88f436cbcdf620b8
tree37ef0dfb7ead444994fd79f60977c71bbaa9ce96
parente235b490de7d0102bae20938bbc3de838d97a969
parent97360f90ce2015f56b860692dabe0aa82786a888
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 97360f90ce  -s ours

* commit '97360f90ce2015f56b860692dabe0aa82786a888':
  Import translations. DO NOT MERGE

Change-Id: Iae715670385932f22208abd984b7add31c1a0084