OSDN Git Service

am db2ec4a6: (-s ours) am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 8 Oct 2013 03:58:33 +0000 (20:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 03:58:33 +0000 (20:58 -0700)
commit51d0d9c8bc7ade9606619d30137bf39e9d1e592d
tree94a5bdb2db03f8c77115492c3baa002d4bf73618
parent8c77d184a1dcdbb875263b01c19aa45e79bb2cd0
parentdb2ec4a6dbb9483863b8bc3c3515fa7cedb53e0b
am db2ec4a6: (-s ours) am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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