am 113769d7: Merge "Fix NPE." into mnc-dev
am 113769d7: Merge "Fix NPE." into mnc-dev

* commit '113769d70b2221697ad9a9553da68ec6483cbfa1':
  Fix NPE.

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