OSDN Git Service

am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 25 Mar 2014 17:19:47 +0000 (17:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 17:19:47 +0000 (17:19 +0000)
commitcdd07216563faccad1c439eee23ca9d4b64c0ac7
tree247c2e2bc1c19590612b497b38df8303b950480e
parent163b865564fdb4d491c54ee04efb17af80a18689
parent27f67d25c8c77e609eb523b98fd7276e0ae8e3e0
am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '27f67d25c8c77e609eb523b98fd7276e0ae8e3e0':
  Import translations. DO NOT MERGE