OSDN Git Service

am f994f353: (-s ours) am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:19:58 +0000 (10:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:19:58 +0000 (10:19 -0800)
commit5414a714b1624774484882e08edd59a3b25ec30c
treecc601c2c420c5235b4e1526d29509c568f4eb13e
parentf678e480644aa77fa0d59c506ff642e4641d2022
parent17aca35d84322d0922f7e846569b1ef9ba418d4c
am f994f353: (-s ours) am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit 'f994f353f705dc69c1e57bd6785092218fd630d2':
  Import translations. DO NOT MERGE