OSDN Git Service

am 2ca1f2a7: am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 3 Jun 2013 21:45:22 +0000 (14:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Jun 2013 21:45:22 +0000 (14:45 -0700)
* commit '2ca1f2a7a4cec46988bfc95df5ac056316584f98':
  Import translations. DO NOT MERGE


Trivial merge