OSDN Git Service

am 5694cd00: (-s ours) am 61ddf10d: Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Thu, 16 Aug 2012 22:05:18 +0000 (15:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Aug 2012 22:05:18 +0000 (15:05 -0700)
commita98e9bbd2e2b8b6abc636035df0db12c44754f93
tree5f4b9ff82f3533926d1872cd5b6c44673f148475
parent6b6355b9bc5e98a08d1356323d6b54dd81695ac5
parent5694cd0058b73b3458ccf76e3e42757cb0b15412
am 5694cd00: (-s ours) am 61ddf10d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5694cd0058b73b3458ccf76e3e42757cb0b15412':
  Import translations. DO NOT MERGE