am 1dae2f93: am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"
am 1dae2f93: am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"

* commit '1dae2f9341c05eee5d77489c579ffd621fbe108b':
  Frameworks/base: Fix potential NPE in Script

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