am 9454e298: am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev
am 9454e298: am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev

* commit '9454e29896e22268416082c99931d13a37b7c71e':
  Fix NPEs when using the APIs a little oddly.

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