OSDN Git Service

am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 13 Mar 2014 17:19:21 +0000 (17:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 17:19:21 +0000 (17:19 +0000)
commita60df014e27d9cd57396655b98922394ff7d73bb
treeaa09b3aed4a2755a8ae6367bd16bbb1556de73fb
parent429720754d85e1b13bc9001adaa23a0b0db04b61
parent846f036ef15a2bea6c522e5b75b351b28c29953c
am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
  Import translations. DO NOT MERGE