tree 93889bbc5a8d90d56155dc652ecff799beadf0a5
parent de258f1eb0355cadb75ee0566f3624bff4930290
parent cfdf7ee64db8820d91a1cd82bf7b961fb2083dce
author Adam Cohen <adamcohen@google.com> 1314303244 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314303244 -0700

Merge "Adding null check to prevent crash when factory resetting device. (5214968)"