tree ed3f8b822c226f7bd1ff17ced4e47a8978d30c88
parent a96d359e402203b4ec835138f44a17c5dc4bc2dd
author Michael Wright <michaelwr@google.com> 1491324296 +0100
committer gitbuildkicker <android-build@google.com> 1491337039 -0700

Make shutdown use the UI context.

Test: manual
Bug: 36879116
Change-Id: Id2d6257a5a462573c3481c886778f51b429117d7
(cherry picked from commit 6cd1026807e427895b7dcfb8bbf010eaa005730c)