OSDN Git Service

am 1a520da7: (-s ours) am b94bb276: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 24 Sep 2013 22:08:22 +0000 (15:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Sep 2013 22:08:22 +0000 (15:08 -0700)
commitbc4102e6b99c1b2f74e54a2d4fbb8a4fb48ebfaf
treedeecd377255b8b8f3c058e61b0473065b9cfaa73
parentc8a5d16afe3898ced389e91e5c4654274ad9c2d2
parent1a520da74cda274f8c380b7c36afd96dae372ce1
am 1a520da7: (-s ours) am b94bb276: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1a520da74cda274f8c380b7c36afd96dae372ce1':
  Import translations. DO NOT MERGE