OSDN Git Service

am 1169cd85: (-s ours) am 1f4e0347: (-s ours) am f14fa7ed: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:41:42 +0000 (14:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:41:42 +0000 (14:41 +0000)
* commit '1169cd85d22b83c1d56a54c5e7291df0031371f0':
  Import translations. DO NOT MERGE


Trivial merge