Merge "[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 30c88f6ff3
-s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
87bd497510