OSDN Git Service

am 87132265: (-s ours) am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 4 Apr 2014 14:53:11 +0000 (14:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 14:53:11 +0000 (14:53 +0000)
commit1c89073daee81ef5d3b4df89d9bcdd0a9daf01b7
tree2d572bc730d6dc24f6f6157f5888fd058f8a342c
parent31e51bab1530c93183467d7fa5371a725ed910d6
parent871322653c4109a9640b56374a246120c65f8241
am 87132265: (-s ours) am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '871322653c4109a9640b56374a246120c65f8241':
  Import translations. DO NOT MERGE