am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev

* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
  Attempted fix for issue 7469415

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base