Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp * commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7': Some StrictMode API changes.
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp * commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7': Some StrictMode API changes.