OSDN Git Service

Merge "ActivityOptions.set/getLaunchStackId() be gone!"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 20 Sep 2017 00:09:09 +0000 (00:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 20 Sep 2017 00:09:09 +0000 (00:09 +0000)
1  2 
api/test-current.txt
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityRecord.java

Simple merge