OSDN Git Service

am 010a775e: (-s ours) am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import transl...
authorYing Wang <wangying@google.com>
Fri, 3 Aug 2012 21:45:21 +0000 (14:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Aug 2012 21:45:21 +0000 (14:45 -0700)
commitb44a7a0d4f72bf482e6f3f95d2027feb46ad61fa
tree777581a1ec50c30ce78a03d911b51f42dac0f8ad
parentff83792ba762c7b1d699f1f01f28a42c2ca7f32f
parent010a775e5120a86d8495806ccde3db11948831ee
am 010a775e: (-s ours) am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE

* commit '010a775e5120a86d8495806ccde3db11948831ee':
  Import translations. DO NOT MERGE