am d8e891f4: am f75e4ca3: Merge "Make it harder to leak contexts"
am d8e891f4: am f75e4ca3: Merge "Make it harder to leak contexts"

* commit 'd8e891f474096c310f60ca6d2f737cdc0251003e':
  Make it harder to leak contexts

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