tree 9bf73450d515adb7b3c4d719b661388f6b35998d
parent 73bb6f749f7f70f1cba2b84d821ac7400c24fbbc
parent b7c91766da97adabda4e6fd459ff2e87eb87d835
author Eric Fischer <enf@google.com> 1299227362 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299227362 -0800

Merge branch 'master' of ssh://android-git:29418/platform/bootable/recovery