OSDN Git Service

am fe8b3e9a: (-s ours) am f4ce8c93: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 27 Mar 2012 23:33:37 +0000 (16:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Mar 2012 23:33:37 +0000 (16:33 -0700)
* commit 'fe8b3e9a6062411d9ce7c97c1499915e5afb9dfb':
  Import translations. DO NOT MERGE


Trivial merge