am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev automerge: b7ce6d6
am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev
automerge: b7ce6d6

* commit 'b7ce6d6db1409ec785d2d7146cbcc897fd02d85b':
  Fix race when cleaning up receivers/services in Context

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