OSDN Git Service

am c61223ce: (-s ours) am cd92dd07: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Thu, 2 Feb 2012 21:27:51 +0000 (13:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Feb 2012 21:27:51 +0000 (13:27 -0800)
* commit 'c61223ce85bc0010130c4fcbc6b3a4aa0543192b':
  Import translations. DO NOT MERGE


Trivial merge