tree 2c4f439994747514de85b7aa538a3ab691c20d64
parent 0946d83b51e17f41c80f32450cb1da5ec1959f7b
author Dianne Hackborn <hackbod@google.com> 1421862913 -0800
committer The Android Automerger <android-build@google.com> 1421881434 -0800

Work on issue #18201239: ANRs in com.google.process.gapps:

Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad