| commit | 01b535185805d5b22c5fffc30833decdca308b5b | [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 | 43c783e665b9e1c47210d3c5a8f929b33acda72f | |
| parent | 10d2991a66e197fb87cbf31fb675b1bdf0ead948 [diff] | |
| parent | 328357bf69276b103382b632c6312dec7cd0bc90 [diff] |
am c8ddd37a: (-s ours) Merge change 20779 into donut Merge commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143' * commit 'c8ddd37aa0f16540f48b1c4170fbb23d6eb03143': DO NOT MERGE. This is merged from master.