tree 40f38617d63b8bb3073a0baacf34137feab14c32
parent 5c53e1b8bbae36d0d5b56ea8498a00128cae3a3f
parent 900550de497ee2e05798728520f7b8a1ce9f5d4b
author Sudheer Shanka <sudheersai@google.com> 1474318059 +0000
committer android-build-merger <android-build-merger@google.com> 1474318059 +0000

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
am: 900550de49

Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1