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)
commit55f432991caeeeb235e9b6c4a42dea09058c4889
tree7737ed8c81a2fe63f70ba9ce2f76e078c4e55302
parent58f25796ca3f9f73f1b1a2241c65aa2682a55fa1
parent3f2ece6ceae3923dca0d54b2e65fa16e79e3752c
am 04250824: (-s ours) Import translations. DO NOT MERGE
automerge: 3f2ece6  -s ours

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