OSDN Git Service

am 15ae6bc7: (-s ours) am 2b8858a9: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 17 Jul 2014 18:20:28 +0000 (18:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:20:28 +0000 (18:20 +0000)
commit830c4d7d122e3572935e3afa84ac31db3078ef2a
treef7731a5d6a6a22cd8ae391d96cfd92c8208b6692
parentd66291503a869bbc40e4459a2537f580ade85ae8
parent40d7d207b2b7cafbf811afcd7b8bba03bbae3b65
am 15ae6bc7: (-s ours) am 2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '15ae6bc7838b6575910e2cbd4f3d008e254ac873':
  Import translations. DO NOT MERGE