OSDN Git Service

am b45bac74: (-s ours) am 0117cc7c: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 12 Jun 2013 21:30:13 +0000 (14:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Jun 2013 21:30:13 +0000 (14:30 -0700)
commitbdd91eab5940515cb3a99b0c10b2d9863c249e4f
treeb95a2c4beb6ab3a8660af77933357c0c75c82637
parent7b5aa58de86a5564f7128bda5e3927b097fc1361
parentb45bac74e9b6e25d131e894c7b98f899f0adf122
am b45bac74: (-s ours) am 0117cc7c: Import translations. DO NOT MERGE

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