tree 8bf4b1e4584d247ea97214329b1a3a266b3f4ce3
parent a41f9cfbbd1d137bf1baab49e0d453a40a0ecd33
parent f0bf29df0cff4b7e370b7c329de92e90a4bab194
author Wink Saville <wink@google.com> 1358991448 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358991448 -0800

am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"

# By Anju Mathapati
# Via Android Git Automerger (1) and others
* commit 'f0bf29df0cff4b7e370b7c329de92e90a4bab194':
  frameworks: Display missing text on SimUnlockScreen