tree c7df67f7338a856b8e0fee9b0b53adc3a2838fcd
parent 423f9fc7df47dddc6df234544675b8885e2d25c7
parent e50734076324b40f396864c6f3b1eb000360b1a1
author Android (Google) Code Review <android-gerrit@google.com> 1249501782 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1249501782 -0700

Merge change 20051

* changes:
  Fix error in settings.db upgrader.  See bug 1999477 for details.