OSDN Git Service

Merge "Fix issue #7209355, #7214271." into jb-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Sun, 23 Sep 2012 19:58:09 +0000 (12:58 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 23 Sep 2012 19:58:10 +0000 (12:58 -0700)
1  2 
api/current.txt
services/java/com/android/server/am/ActivityStack.java

diff --cc api/current.txt
Simple merge