| commit | 50cb54ff5cdb233d01e1dd94b355cbfe0a371520 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Tue Aug 11 18:12:34 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 18:12:34 2009 -0700 |
| tree | 075adf5361bec3b2a0d527fdc1f6ff4e002f1deb | |
| parent | 77208f852c232033c5ae617ab93cf05a8af46b51 [diff] | |
| parent | c8ddd37aa0f16540f48b1c4170fbb23d6eb03143 [diff] |
am c8ddd37a: (-s ours) Merge change 20779 into donut Merge commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143' * commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143': DO NOT MERGE. This is merged from master.