tree fce26f5e0317f2a6e4bf5d442975d69f1a92d205
parent 54ecf3c636dda257cbfd22b3bc86afff8c910372
parent cf54e4aafc0f4406567fc236b850e8dc507c7093
author Irfan Sheriff <isheriff@google.com> 1316483938 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316483938 -0700

Merge "Add supplication shut down recovery" into ics-factoryrom