OSDN Git Service

Merge "DO NOT MERGE " into lmp-preview-dev
authorWinson Chung <winsonc@google.com>
Tue, 27 May 2014 17:07:10 +0000 (17:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 May 2014 17:07:10 +0000 (17:07 +0000)
commit8f4f2ff5cbd9cf5733437afeb54f8a2453d9e616
treea2e8a182ed9a9abe00f2cdc6fbbf590a356a3127
parentc752919c7cd29b497918618cc9ebf56c18995a76
parent376543bc5f1f8a4465f6f0f9c9b45f96f37b3d06
Merge "DO NOT MERGE " into lmp-preview-dev
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java