OSDN Git Service

am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 20 Feb 2014 18:03:02 +0000 (18:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 18:03:02 +0000 (18:03 +0000)
commit08394af265b02db7a76c4f4f4ae16b9d238e7580
tree1c7669753ee3355ffc7a699a225cf5afda97794c
parent2cb9147fc49e6474eaf30fd833e43df10e42b899
parente69b7b3474c356438fbd65e43438e72ebda0bacb
am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e69b7b3474c356438fbd65e43438e72ebda0bacb':
  Import translations. DO NOT MERGE