am 983faeed: Merge "Fix NPE" into jb-mr1-dev
am 983faeed: Merge "Fix NPE" into jb-mr1-dev

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