OSDN Git Service

am c959f029: (-s ours) am 88b7b007: (-s ours) am 3cdc6f0a: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:51 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:51 +0000 (18:14 +0000)
commit2c1413d0cb19ee74337b51060475cd1c81a83e01
tree3804e07840427a842ef1bdc750bffe2239123c26
parentc5712c82f73c688db837b3b24310206d7ba01d03
parentc959f0296af028e9666e0c4679adf724449d5934
am c959f029: (-s ours) am 88b7b007: (-s ours) am 3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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