OSDN Git Service

am 6e657227: am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)
* commit '6e6572275c4b810281fe261545f8c3b48cf73568':


Trivial merge