OSDN Git Service

am ecb96401: (-s ours) am 00808b02: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 12 Jun 2012 20:15:05 +0000 (13:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Jun 2012 20:15:05 +0000 (13:15 -0700)
* commit 'ecb96401786c784eef8016625db80a7e2d3714f0':
  Import translations. DO NOT MERGE


Trivial merge