am 3430f599: am ba43f7e9: Merge "Revert "Sometimes the application context is null""
am 3430f599: am ba43f7e9: Merge "Revert "Sometimes the application context is null""

* commit '3430f59951328c6d17045fbc8f85f629723af541':
  Revert "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