tree 578c5ae82d7adb4ed082baed41d528d552eda7bc
parent ca059d6d1f62db8c094ce9d1451cc7a386d04aaf
parent 68c308607b01bafd31c91572a81f4563e2199260
author Amith Yamasani <yamasani@google.com> 1355341601 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355341601 -0800

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

* commit '68c308607b01bafd31c91572a81f4563e2199260':
  Don't update global table when upgrading secondary users' database.