tree 3bff99ea7306c767a0a53d4afdb2139c9fac8db4
parent ce3fa2b63bf86b1a917cdf1c2931e01fd192041a
parent 5d2fadb1492c1a2dd5437fcfb4afde2b2c3df4bd
author Ed Heyl <ed@google.com> 1328562843 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328562843 -0800

am 5d2fadb1: (-s ours) am 529a793c: am daeb1d90: am c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup

* commit '5d2fadb1492c1a2dd5437fcfb4afde2b2c3df4bd':