OSDN Git Service

am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
authorBaligh Uddin <baligh@google.com>
Thu, 12 Dec 2013 16:40:40 +0000 (08:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Dec 2013 16:40:40 +0000 (08:40 -0800)
commit63f898ac1117379b073de5ec40019d8c46acbf7c
treeada68adf262b3dfb6afe67a025ee1747c1eead85
parentf0ab16cfebed98074e06a60cc1752f3dcfbb6870
parent299926e60f4ac8ef3a228ca38ce45d290b69659b
am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '299926e60f4ac8ef3a228ca38ce45d290b69659b':
  Import translations. DO NOT MERGE