tree 68389829d598bca285584b263f535a3e714123d3
parent 812017e58fc913298575ac183dd8d4163deee555
parent fe7a18c4e17a179a0f26e139d3eae20393c1a8ae
author Jim Miller <jaggies@google.com> 1266016840 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1266016840 -0800

Merge "Watch 2274882: Add a field to the db when we wipe due to an error in the upgrader."