commit | f56e2157bed15c3adf929b284fed5882be9c3533 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Mon Sep 17 11:10:16 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 17 11:10:16 2012 -0700 |
tree | f0c878ef96e7bfb9e442d1b446d83c68db03afb3 | |
parent | e4e3c9dce2c8c64df9d5cf939ec640af1ce2fe51 [diff] | |
parent | f58fbae956d16534405204c0ba22ef9d6ec052e3 [diff] |
am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev * commit '1e364acac6f4768672deb73485e93c32929e25fd': Actually move to Global settings.