OSDN Git Service

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358e...
authorSudheer Shanka <sudheersai@google.com>
Tue, 20 Sep 2016 09:02:39 +0000 (09:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 09:02:39 +0000 (09:02 +0000)
commit564fc8f8338ecd3fc4f1e2e5e4b69020cf86cdb6
tree8dd4839d7c652aac1f677515ab020370f15ef582
parentdf54f995871dd01548a3fa20e772c1d384b5c83d
parent73d479afeb5552dbe6f7fd8cd121274e1d82eb4c
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558  -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2  -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986  -s ours am: 7efc56cc65
am: 73d479afeb

Change-Id: I52e8c249eb598dae1c76ad2034e532d57be030e2