OSDN Git Service

am c8ddd37a: (-s ours) Merge change 20779 into donut
authorGrace Kloba <klobag@google.com>
Wed, 12 Aug 2009 01:12:34 +0000 (18:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2009 01:12:34 +0000 (18:12 -0700)
commit50cb54ff5cdb233d01e1dd94b355cbfe0a371520
tree075adf5361bec3b2a0d527fdc1f6ff4e002f1deb
parent77208f852c232033c5ae617ab93cf05a8af46b51
parentc8ddd37aa0f16540f48b1c4170fbb23d6eb03143
am c8ddd37a: (-s ours) Merge change 20779 into donut

Merge commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143'

* commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143':
  DO NOT MERGE. This is merged from master.