am 08df9eac: am ef279363: Merge "Fix a crash." into jb-dev
am 08df9eac: am ef279363: Merge "Fix a crash." into jb-dev

* commit '08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2':
  Fix a crash.

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