OSDN Git Service

am 1c0bdeef: am 630cb4aa: (-s ours) Merge change Iabe6771c into eclair
authorEric Fischer <enf@google.com>
Wed, 2 Dec 2009 23:21:24 +0000 (15:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 23:21:24 +0000 (15:21 -0800)
commite0f3a29c2962e6abca8a8735d7d3f08391b9ab94
tree4ad12bfc09c175e43a3b2a0c86b1476b58d95020
parentb054d81b5e6d84dfd9e37dce750e6c51a4a8e40f
parent1c0bdeef8daf13aab06143f11c9827467a8ce973
am 1c0bdeef: am 630cb4aa: (-s ours) Merge change Iabe6771c into eclair

Merge commit '1c0bdeef8daf13aab06143f11c9827467a8ce973' into eclair-mr2-plus-aosp

* commit '1c0bdeef8daf13aab06143f11c9827467a8ce973':
  Import revised translations.  DO NOT MERGE