OSDN Git Service

am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 29 Oct 2012 20:39:23 +0000 (13:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Oct 2012 20:39:23 +0000 (13:39 -0700)
commit27c1348b43125cf31e84ed93987989c6d37d5cb7
tree5ed2d5dbae30aa82d84acacdef3a6f8321d6e048
parentaee2ef0a848d8008eda92a0f1fbdcb65af0490ce
parent5fb549bf5f21cb240b4af35779e291d5d48f0109
am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5fb549bf5f21cb240b4af35779e291d5d48f0109':