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

* commit 'ef279363716706192b4da543fcae3e92cc14d27e':
  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