am 8735745b: am 55187f18: Prevent NPE in new API.
am 8735745b: am 55187f18: Prevent NPE in new API.

* commit '8735745b28ddc80b1b57c06a8ed7c752fa6fd167':
  Prevent NPE in new API.

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