From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 1 May 2018 23:08:15 +0000 (+0000)
Subject: Merge "Workaround task-resolution bug in AM" into pi-dev
X-Git-Tag: android-x86-9.0-r1~43^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb5a46fabd;p=android-x86%2Fpackages-apps-Settings.git

Merge "Workaround task-resolution bug in AM" into pi-dev
---

bb5a46fabd941a87b354c82c92021a9db2e1b27e