OSDN Git Service

am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 5 Dec 2013 19:24:32 +0000 (19:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 19:24:32 +0000 (19:24 +0000)
commit37a4625058d86f315fa3e9c1de9e309103fa4149
treed4c7f65d63d17434ea04029bf7be76559e30568b
parentd7f043459d2132a14495fd069c9539826b792792
parent2246e8c76b16d877131dee9b66eaca570c8c436f
am 2246e8c7: (-s ours) am b83f6223: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '2246e8c76b16d877131dee9b66eaca570c8c436f':