tree 54d5f76a31728976ba75e590c077cefc1448ac82
parent 0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a
parent bf6f6f9de72c9fd15e6bda9f228c05a9b37d6324
author Jeff Brown <jeffbrown@google.com> 1348617746 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348617791 -0700

Merge changes I332f020f,I632648ac into jb-mr1-dev

* changes:
  Update references to migrated global settings.
  Handle user switched for settings changes.