OSDN Git Service

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am...
authorSudheer Shanka <sudheersai@google.com>
Tue, 20 Sep 2016 05:53:25 +0000 (05:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 05:53:25 +0000 (05:53 +0000)
am: eacf98bf52

Change-Id: Ieff347e63bf42a009f60d1d0ba7c8eeb6cda37d7


Trivial merge