OSDN Git Service

am af9cbc38: (-s ours) am aeee054f: am 1cf344e2: Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 30 Oct 2012 00:15:56 +0000 (17:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 00:15:56 +0000 (17:15 -0700)
commit0edad215fd7da19d9b8c885e932f83b327b582c9
tree3c3c9a3619690a7080693870a9ca8bd0167a1c52
parentb7eb1cc8c5c6724a127a61ba4137172fc201fb7e
parentaf9cbc38c189022923d8cb36441e016541c980dc
am af9cbc38: (-s ours) am aeee054f: am 1cf344e2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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