OSDN Git Service

am 48fa42b5: (-s ours) am 3f573fae: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 16 Jul 2013 02:42:24 +0000 (19:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Jul 2013 02:42:24 +0000 (19:42 -0700)
commit508165e3aa8b2fc48a7c5674b4136f7afcfa33e7
treefbadcd746a0b5dc07036bbf04f46af1739819356
parentf462cd6d8ed1252292de9a1ab2d42f8e403fc603
parent48fa42b58bd46c9f424b249827ae68beeb54c49b
am 48fa42b5: (-s ours) am 3f573fae: Import translations. DO NOT MERGE

* commit '48fa42b58bd46c9f424b249827ae68beeb54c49b':
  Import translations. DO NOT MERGE