tree e87f7d765b35b8d62c80d54e8a318f830f335a57
parent c025347cf2f312305a585d80dc829f9247b4b933
parent ac56b8adde9ac6ff5d1fe25bbb7ce4599b7630ae
author Bryce Lee <brycelee@google.com> 1497007084 +0000
committer android-build-merger <android-build-merger@google.com> 1497007084 +0000

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

Change-Id: I78c8fc62d4050546896262245785084fd5cab609