tree 5d2f4b7a64414c7a3ac3c07b5613b612d82392d6
parent 20914c6ae93b5f4f86c014a0a38f6501e1c59e6c
parent 2542fd54ac943002cb7537029404dcc80a6491ac
author Jim Miller <jaggies@google.com> 1370105500 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370105500 -0700

am 2542fd54: am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev

* commit '2542fd54ac943002cb7537029404dcc80a6491ac':
  Fix keyguard issue where an incoming SMS would switch widget