diff options
| author | Doug Zongker <dougz@android.com> | 2010-07-09 09:13:51 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2010-07-09 09:13:51 -0700 |
| commit | 050d0f7fec309a51d1e616a98882faaf3655e04e (patch) | |
| tree | d37922f6f059d9a242bf4ef3b29c90e127c1c175 /default_recovery_ui.c | |
| parent | f291d858f8c9bf40051d50adfd10e758aa222315 (diff) | |
| parent | c02c37a1e6bd67198a6522461b81c9cdd125625e (diff) | |
| download | bootable_recovery-050d0f7fec309a51d1e616a98882faaf3655e04e.zip bootable_recovery-050d0f7fec309a51d1e616a98882faaf3655e04e.tar.gz bootable_recovery-050d0f7fec309a51d1e616a98882faaf3655e04e.tar.bz2 | |
resolved conflicts for merge of c02c37a1 to master
Change-Id: Iafb9cb4adf27a7086d587d95e94ab1bd050099dc
Diffstat (limited to 'default_recovery_ui.c')
0 files changed, 0 insertions, 0 deletions