tree 07d5bf6ee6d8f59aea4748a6b3394dfc48fd3775
parent 01440c43c7dd130d159f4bf3700e04d714b45bab
parent c54cd5acdb662660caaf28ec8e89708f40247314
author Jeff Brown <jeffbrown@google.com> 1348617755 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348617755 -0700

Merge "Update references to migrated global settings." into jb-mr1-dev