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)
* commit '4ecaa6890d0be8018d8c85c6590e81601e31312b':


Trivial merge