am fb29ca21: am 776e81be: am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
* commit 'fb29ca21002c99986899705fad439037d7b91f56': Fix the security related API change for PreferenceActivitymain
commit
cb864c5501