OSDN Git Service

am dbe1d305: (-s ours) am 9fd72934: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sat, 5 Oct 2013 16:41:02 +0000 (09:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Oct 2013 16:41:02 +0000 (09:41 -0700)
commit5ccf8648e3167e1488d91def006418fc426fbdd3
tree3b39a79a001cae794caaae2ff90262b85f2a87cd
parent52de9476b2c343585487009a89a18f7fa97a4f1f
parentdbe1d305919eb2528a36c981cf1ccff6ad11ca09
am dbe1d305: (-s ours) am 9fd72934: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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