OSDN Git Service

am ee6199cc: (-s ours) am e1dade77: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 26 Nov 2012 17:34:18 +0000 (09:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Nov 2012 17:34:18 +0000 (09:34 -0800)
* commit 'ee6199cc9311f06dffdd02d20dcfbcd60fd6ea80':
  Import translations. DO NOT MERGE


Trivial merge