OSDN Git Service

Merge "Make android:cantSaveState an optional feature." into pi-dev
authorDianne Hackborn <hackbod@google.com>
Tue, 8 May 2018 17:59:32 +0000 (17:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 8 May 2018 17:59:32 +0000 (17:59 +0000)
1  2 
api/current.txt
services/core/java/com/android/server/am/ActivityManagerService.java

diff --cc api/current.txt
Simple merge