tree d9d538b329cb3aff39aed5ac276129a0fbedee34
parent 911f86e817a0f75165cac41d10c3fff6fcacd336
parent 8402a17417769d955bb0b5cd46db3a3840047afe
author Sudheer Shanka <sudheersai@google.com> 1474341620 +0000
committer android-build-merger <android-build-merger@google.com> 1474341620 +0000

Merge "Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf" into nyc-mr1-dev
am: 8402a17417

Change-Id: Ia085a05cebbc91edb0467edef72afa08c83287c4