OSDN Git Service

am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:51:51 +0000 (15:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:51:51 +0000 (15:51 -0800)
commit039e80be8d5c7fabfd8e168d5e86ce83b33fb916
tree3a5f097a20836ab85a99a015604ce2d66773866e
parentcaf70588f7a97aaad805b008f91c750fe59b45b5
parent4ecaa6890d0be8018d8c85c6590e81601e31312b
am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '4ecaa6890d0be8018d8c85c6590e81601e31312b':