am 6cbaa773: Merge "resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
am 6cbaa773: Merge "resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp

* commit '6cbaa773bdfce3c09523d0a0c038648187d3812d':
  Sometimes the application context 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