OSDN Git Service

am 2193e589: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Tue, 9 Dec 2014 23:16:02 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Dec 2014 23:16:02 +0000 (23:16 +0000)
commit830f8b347ba067386546e6857e41b4b282037def
treec13f4cc8f6aadf94eb43851bdb03e79b426b2ce7
parent2537275ac1890edb3e831a8de1ab078326d0a3af
parent5e833090d82d9c32a62616710c1482129b4f6fd1
am 2193e589: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: 5e83309  -s ours

* commit '5e833090d82d9c32a62616710c1482129b4f6fd1':
  Import translations. DO NOT MERGE