OSDN Git Service

am 4bb6f6e2: (-s ours) am 57913c82: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sat, 5 Oct 2013 16:37:02 +0000 (09:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Oct 2013 16:37:02 +0000 (09:37 -0700)
commit2c5ad7cc54e89cbb29f43ea503e371c7d66195d8
tree0af02e2c50b1d11a43c0223d7548504bcf52acb7
parent7ef6f5be7aa363b5200b9e4ec9405a8752e31ee7
parent4bb6f6e2d56fb6b42bfb63a8e75fa77018cfde1a
am 4bb6f6e2: (-s ours) am 57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4bb6f6e2d56fb6b42bfb63a8e75fa77018cfde1a':
  Import translations. DO NOT MERGE