OSDN Git Service

am d6f21ca2: (-s ours) am fcb93331: (-s ours) am ee7df0a3: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 24 Jul 2014 23:50:22 +0000 (23:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 23:50:22 +0000 (23:50 +0000)
* commit 'd6f21ca236c8da2d38e6303b1250a7865442b3ff':
  Import translations. DO NOT MERGE


Trivial merge