OSDN Git Service

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am...
authorSudheer Shanka <sudheersai@google.com>
Tue, 20 Sep 2016 00:11:54 +0000 (00:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 00:11:54 +0000 (00:11 +0000)
commit1781d2bd3b8db22a68f2266d8194d2c9dd827e5a
treec4dd5d05fcfca7c987e57ea0f2219cc9783ffae1
parente44f8fcca454c0773726b29c5e204f1f1595691e
parent426ba52b420a311aa6aa3233d950341aa8c2ca5c
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5
am: 426ba52b42  -s ours

Change-Id: I861ed40fa031d4add94e48b2fbbfb965ef1ca7d2