OSDN Git Service

Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
authorWinson Chung <winsonc@google.com>
Wed, 12 Jul 2017 22:32:42 +0000 (22:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Jul 2017 22:32:42 +0000 (22:32 +0000)
commitfbb85140f847e3cff946c7c742e467692f4c73c4
tree7cd11f9582a51cc91c9fc0831fcc8c87c0dd6001
parentd24ed58bc267bacee91c91c7098dc70b1180a398
parent1cebea61ac756ea1aaddb8c8c9bb43fe813bbf55
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
services/core/java/com/android/server/am/ActivityStack.java