OSDN Git Service

Merge "Merge "Prioritize reused activity's stack over computed stack." into oc-dev...
authorBryce Lee <brycelee@google.com>
Fri, 9 Jun 2017 11:34:29 +0000 (11:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 11:34:29 +0000 (11:34 +0000)
commite2c5259110d099254ff4c10cce510c46ce28cb87
tree0d9968c204d76f60c6540e5eb6bbd06f2ccdbdc0
parentc188bd0fbdc7226b5a0d4055b8cf7e9f64d1c8bb
parent7dcba84cbe10423a97b4a305acaa747b494bc1a1
Merge "Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde am: d1e55c133d" into oc-dr1-dev-plus-aosp
am: 7dcba84cbe

Change-Id: Id0e27313d7eaf3c545ccfd6d1da65bff8d3ad98f