OSDN Git Service

am ec5d4aa1: (-s ours) am a78321d7: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 24 Sep 2014 18:08:50 +0000 (18:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Sep 2014 18:08:50 +0000 (18:08 +0000)
commit3325d27b36f0348f1583124493cb439992530e6d
tree499c28dc24b8f7bcc1a9cd04398a47a6825f412e
parentc40155fd235302bee7e0fb57cb848c0e1420166d
parentac46aec36c51982a1a1d6a60bf8f7ca4a8dbf635
am ec5d4aa1: (-s ours) am a78321d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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