OSDN Git Service

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1
authorSudheer Shanka <sudheersai@google.com>
Mon, 19 Sep 2016 21:50:49 +0000 (21:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Sep 2016 21:50:49 +0000 (21:50 +0000)
am: c1b2e6db98  -s ours

Change-Id: I006233ce7258467da7d5c09c9925bd6048d85ed3


Trivial merge