tree 57c17e36aeb3ac2f419146d3970ef5c970c6af88
parent daa0bd49ea7461f44d4d5c81ca621355e12772b1
parent cbf1bd40eabaa02ebf0950b60d0e88a0104c7885
author Bryce Lee <brycelee@google.com> 1497007502 +0000
committer android-build-merger <android-build-merger@google.com> 1497007502 +0000

Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde
am: cbf1bd40ea

Change-Id: I5770bf1ed814ba03bad9a08c0cf59151aef34100