OSDN Git Service

am 41d5cb0c: (-s ours) am b5ad15ae: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 28 Jan 2015 15:41:01 +0000 (15:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Jan 2015 15:41:01 +0000 (15:41 +0000)
commit318a0601909b77ac68607cddc6d87eea5e32c3b6
tree280df3bc35c7e0cb026a1349951b1cf46666dd15
parent34f67e45319f398fb27e05d56918f951e6d44607
parent41d5cb0cb32198dabd3a381074a68bcd0bb089a8
am 41d5cb0c: (-s ours) am b5ad15ae: (-s ours) Import translations. DO NOT MERGE

* commit '41d5cb0cb32198dabd3a381074a68bcd0bb089a8':
  Import translations. DO NOT MERGE