OSDN Git Service

am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Thu, 8 Nov 2012 02:29:07 +0000 (18:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 02:29:07 +0000 (18:29 -0800)
* commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':


Trivial merge