OSDN Git Service

am d42f82b3: (-s ours) am 814360ae: Merge "Import translations. DO NOT MERGE" into...
authorEric Fischer <enf@google.com>
Tue, 1 May 2012 20:33:33 +0000 (13:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 May 2012 20:33:33 +0000 (13:33 -0700)
* commit 'd42f82b3c0836d500cc9584a590362ec26337156':
  Import translations. DO NOT MERGE


Trivial merge