2d19a67686
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp * commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d': Fix #2999258: ANR in Settings after every reboot