OSDN Git Service

am be183dac: (-s ours) am 838d6dc9: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 9 Dec 2014 23:15:54 +0000 (23:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Dec 2014 23:15:54 +0000 (23:15 +0000)
automerge: 63f6520  -s ours

* commit '63f6520ce9dacd9c99fb5d5e53c42ca5df869167':
  Import translations. DO NOT MERGE


Trivial merge