OSDN Git Service

am 04250824: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 12 Jan 2015 23:45:01 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jan 2015 23:45:01 +0000 (23:45 +0000)
automerge: 3f2ece6  -s ours

* commit '3f2ece6ceae3923dca0d54b2e65fa16e79e3752c':
  Import translations. DO NOT MERGE


Trivial merge