OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Sun, 22 May 2016 23:34:29 +0000 (23:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 22 May 2016 23:34:29 +0000 (23:34 +0000)
commitc6bc849b33fb9777636ad931c71cd27338298799
tree37ef0dfb7ead444994fd79f60977c71bbaa9ce96
parent938d8da54f7c325824bfb9ec00383a10c4826ad4
parent83378cb13689fa73be349a9ce4b0802ed64fc935
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 83378cb136  -s ours

* commit '83378cb13689fa73be349a9ce4b0802ed64fc935':
  Import translations. DO NOT MERGE

Change-Id: Id406199ec77f14e947db6f7c65a2f3b65795374d