am 815af1ff: Merge "Throw NPE if s is null"
am 815af1ff: Merge "Throw NPE if s is null"

* commit '815af1ff595a6c028f28c16139a9e64ad98507a3':
  Throw NPE if s is null

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