OSDN Git Service

am d9954e12: (-s ours) am 3191875f: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 4 May 2012 20:30:05 +0000 (13:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 May 2012 20:30:05 +0000 (13:30 -0700)
* commit 'd9954e12a82d8fca4d08614657b7ee7509ba6294':
  Import translations. DO NOT MERGE


Trivial merge