tree ab67fafc091eec21922297f9501afd9cc6423b1b
parent 73d479afeb5552dbe6f7fd8cd121274e1d82eb4c
parent 4c77b60440a9370807484134ab8f86263934cae3
author Sudheer Shanka <sudheersai@google.com> 1474362089 +0000
committer android-build-merger <android-build-merger@google.com> 1474362089 +0000

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98  -s ours am: ff9a8d74c7  -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62  -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b  -s ours
am: 4c77b60440

Change-Id: If4c85af955349593b5b6bf0ef680b6028abd5761