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)
commitd6627d9021b1480a0de8e2e1b370680eb1fe6963
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent5bfbac9f362b807d2ad5a93a6535c4bade10b06f
parentaf479cb3b6ca11e846e5d7e19f546776fb7a08cc
am af479cb3: am f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'af479cb3b6ca11e846e5d7e19f546776fb7a08cc':