tree 3cf95847e5d9073f0a8e01f6620df720f4827d1b
parent 0b1711582ff07d6d1e8e4de6c057eaf6a3473ac3
parent bdfce2ec05a3e9ca6acd6711de6133e06f2446e6
author Jeff Sharkey <jsharkey@android.com> 1348715744 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348715745 -0700

Merge "First step towards cleaning up Global settings." into jb-mr1-dev