OSDN Git Service

am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 7 Jan 2014 00:37:46 +0000 (00:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jan 2014 00:37:46 +0000 (00:37 +0000)
commit24c2980cb2a9a93d1d6fe2a849f915b3819056c2
tree80f51c86a4836bcc78a76dd9e65fa364c87374d8
parentfce889710225bfefd99af59afb83085b23a79704
parentbe24e41b41e9ccec3bb685baf9dc951b386116ee
am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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