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 08:00:37 +0000 (08:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 08:00:37 +0000 (08:00 +0000)
commit3a87b6773b1442dc2b3a67411b5425224a2d580c
tree05ed71e4aca039523795e575a6e333c1ea18c5a0
parent34a5ce150d14e302a481f70995e9133bc5e30fde
parent7efc56cc65f5eaa2ecb9c0bc0acb698cb4f34172
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

Change-Id: Ic8fab1cdbd0d1f5e078fab4185e20ce71777a743