tree 61283f2a4771a53a05688b29a32686103b054a5f
parent 207e66ecca9828a341b2968848d4d20be1b2532c
parent 65317bac02e993d1313a1958a8497ff5f2a2ecd5
author Bryce Lee <brycelee@google.com> 1523398266 -0700
committer android-build-merger <android-build-merger@google.com> 1523398266 -0700

Merge "Properly remove activity from task on start failure." into pi-dev
am: 65317bac02

Change-Id: Id0770cf31559d3ccd80332a4fa1178f92b360eeb