OSDN Git Service

am 28999ebb: (-s ours) am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 17 Jul 2014 17:03:24 +0000 (17:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 17:03:24 +0000 (17:03 +0000)
* commit '28999ebb5feed6fab786fd85cd11975f681ae3c6':
  Import translations. DO NOT MERGE


Trivial merge