OSDN Git Service

am e722b26f: (-s ours) am b79e7627: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Wed, 9 May 2012 17:11:51 +0000 (10:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 May 2012 17:11:51 +0000 (10:11 -0700)
* commit 'e722b26f8544f6a5cac701e30490c7de5bddd30e':
  Import translations. DO NOT MERGE


Trivial merge