OSDN Git Service

am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:57:00 +0000 (15:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:57:00 +0000 (15:57 -0800)
commit1ed8206143ab7e60e5b3c92cc434562797e116fe
tree3a5f097a20836ab85a99a015604ce2d66773866e
parentcfaea9f2403614b5cd45a679f57c16d10486ffeb
parent2bd00f793ffe9d20ec117515812cc4e534a5d876
am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2bd00f793ffe9d20ec117515812cc4e534a5d876':