OSDN Git Service

am 83b99712: (-s ours) am 11b56e6d: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
commita9184922c5053de639bff79b6260f586bae420a2
tree3804e07840427a842ef1bdc750bffe2239123c26
parentb9c715849c93fc219a7e3a5a2abc07acea609601
parent83b99712f151f5c124febed2b09fe8ce484b3841
am 83b99712: (-s ours) am 11b56e6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '83b99712f151f5c124febed2b09fe8ce484b3841':
  Import translations. DO NOT MERGE