am a89d3d35
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
Merge commit 'a89d3d3591c4457d46f1f2726c05ae8c2b3dc708' * commit 'a89d3d3591c4457d46f1f2726c05ae8c2b3dc708':
This commit is contained in: