tree 0d1faae91f3c4750c440fbd06f733868b85b9d2a
parent 1858bfd1a5d951b8c14f81b11172dfed84f5d87f
parent 9a1473406f634ea541bd1643dc70d9aae8c10e77
author Amith Yamasani <yamasani@google.com> 1355341274 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355341274 -0800

am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev

* commit '9a1473406f634ea541bd1643dc70d9aae8c10e77':
  Don't update global table when upgrading secondary users' database.