OSDN Git Service

am f6688d1e: (-s ours) am ceab9f07: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 25 May 2012 18:35:46 +0000 (11:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 May 2012 18:35:46 +0000 (11:35 -0700)
* commit 'f6688d1e099d79ff288dc14ee94e7ad2bcf1c470':
  Import translations. DO NOT MERGE


Trivial merge