OSDN Git Service

am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
authorBaligh Uddin <baligh@google.com>
Fri, 4 Apr 2014 14:37:50 +0000 (14:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 14:37:50 +0000 (14:37 +0000)
* commit 'cc01536f7755da6560a23057ac3dbdec10e3993f':
  Import translations. DO NOT MERGE


Trivial merge