OSDN Git Service

am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 7 Jan 2015 14:28:07 +0000 (14:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 14:28:07 +0000 (14:28 +0000)
commit0347196c6992e490be74c2a4015bc6cd64504f15
treebcda49d1b93d7bc79660d3dd5b1fa41ce2b5c5ab
parent51aedf86037f027898ec279befe869c80ef9730c
parent1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0
am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE

* commit '1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0':
  Import translations. DO NOT MERGE