am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev
am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev

* commit '220b65d21dcb332b9bb39e2c75a5adba5d7c73d9':
  Fix NPE for CTS.

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