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