OSDN Git Service

am a8c28134: (-s ours) am f35b013b: am 7717e194: (-s ours) am 7021c6e6: (-s ours...
authorYing Wang <wangying@google.com>
Thu, 26 Jul 2012 15:15:18 +0000 (08:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 15:15:18 +0000 (08:15 -0700)
commit6b7f901aa2547fd99779d4f2a1dc3295cca766ea
tree5023564b0d4befdbfd2055e55fb17f0c2dbe06a9
parent82ab59f221cfb5865ddb30b815fda294df3aa2b1
parenta8c281347d453b9abba10d91a86ee8d8c6725690
am a8c28134: (-s ours) am f35b013b: am 7717e194: (-s ours) am 7021c6e6: (-s ours) am c31f6b23: Import translations. DO NOT MERGE

* commit 'a8c281347d453b9abba10d91a86ee8d8c6725690':