OSDN Git Service

am ecd0e033: (-s ours) am 92b5162f: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Thu, 3 May 2012 19:57:12 +0000 (12:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 May 2012 19:57:12 +0000 (12:57 -0700)
commit3db58a46d49357c008e181f3df7ea8b584f2b239
treeeb7f9d533264da2f35de3e1694482218d5b3a336
parentb43d45df4951e887f4012f04067092688fc447ef
parentecd0e03300f765d1a34a4189d07cde22975d4a4e
am ecd0e033: (-s ours) am 92b5162f: Import translations. DO NOT MERGE

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