am 36b8d75f: am 311ef539: (-s ours) am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (3) and others
* commit '36b8d75f':
frameworks: Display missing text on SimUnlockScreen