OSDN Git Service

am af479cb3: am f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:58:42 +0000 (15:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:58:42 +0000 (15:58 -0800)
* commit 'af479cb3b6ca11e846e5d7e19f546776fb7a08cc':


Trivial merge