tree 085717bdd255fd15330cda2a0d0bfe5355f96068
parent a0bfff6d1dd2476b2e168677e889461f3400fb57
parent 684eb30cb4d5512bd2633a59ad0c816b06a0bd61
author Winson Chung <winsonc@google.com> 1531437143 -0700
committer android-build-merger <android-build-merger@google.com> 1531437143 -0700

[automerger skipped] Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev am: 7775af2778
am: 684eb30cb4  -s ours

Change-Id: I860033381de790bc76a587c8cda34666214681a0