tree 75930729b2387c65544a4322137880c7c73f32b1
parent 011172a73187ebdf50041809a98101432a191a52
parent 2a2c463a0171e92e832aeee804905f9ec7a7c191
author Sudheer Shanka <sudheersai@google.com> 1474338102 +0000
committer android-build-merger <android-build-merger@google.com> 1474338102 +0000

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036  -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6
am: 2a2c463a01  -s ours

Change-Id: Ib7fe0eba9cb3eeb4f42355dde3835753af1c2b5b