| commit | a534a63a430a4fc8711679179dd26a47603028db | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Tue Sep 21 11:41:11 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 21 11:41:11 2010 -0700 |
| tree | 25d414048817d4a815150609c0ee56b358a0b4bb | |
| parent | efc1160a8573c9132dd164b93a9495277d93d287 [diff] | |
| parent | 39d2c2cc3388ffd62bfce997aa2ad9f30a785e91 [diff] |
am bd1578fb: (-s ours) am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread Merge commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063' * commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063': recovery just takes a filename as an argument now (do not merge)