Merge commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp * commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391': Add null check for package settings
Merge commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp * commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391': Add null check for package settings