OSDN Git Service

am e0f3a29c: (-s ours) am 1c0bdeef: am 630cb4aa: (-s ours) Merge change Iabe6771c...
authorEric Fischer <enf@google.com>
Thu, 3 Dec 2009 04:40:54 +0000 (20:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Dec 2009 04:40:54 +0000 (20:40 -0800)
commit17a0bbc9f6ed5b6275a5f2e8e768ab1a68670764
tree4ad12bfc09c175e43a3b2a0c86b1476b58d95020
parenteaa9bfc87944fb47e4f2f2761e7d017db3913b73
parente0f3a29c2962e6abca8a8735d7d3f08391b9ab94
am e0f3a29c: (-s ours) am 1c0bdeef: am 630cb4aa: (-s ours) Merge change Iabe6771c into eclair

Merge commit 'e0f3a29c2962e6abca8a8735d7d3f08391b9ab94'

* commit 'e0f3a29c2962e6abca8a8735d7d3f08391b9ab94':
  Import revised translations.  DO NOT MERGE