OSDN Git Service

am 6d0b2f4e: am 051b6cdd: am 8405f65e: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 6 Nov 2012 00:01:05 +0000 (16:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 00:01:05 +0000 (16:01 -0800)
commit4ef629000fb9b823598efdd45ab45bb57e4564c7
tree3a5f097a20836ab85a99a015604ce2d66773866e
parentfe0b5b4e8d246a26dd1516ba723810e9fa0741b4
parent6d0b2f4e736e369e1691ab6f2e903dc056cfdde0
am 6d0b2f4e: am 051b6cdd: am 8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '6d0b2f4e736e369e1691ab6f2e903dc056cfdde0':