OSDN Git Service

resolved conflicts for merge of 8995e140 to lmp-mr1-wfc-dev
authorCraig Mautner <cmautner@google.com>
Mon, 26 Jan 2015 21:57:19 +0000 (13:57 -0800)
committerCraig Mautner <cmautner@google.com>
Mon, 26 Jan 2015 21:57:19 +0000 (13:57 -0800)
commit3c878f26c94e69d21fc633708329f8e6b87943f3
treeef4f60fefc074fb938313464aacf10a336544d2e
parent7d4bc61e08366e91756c1ee2bd62fc1d13ad29c7
parent8995e140ad557c9f3f4667becbaaf0ba4c667638
resolved conflicts for merge of 8995e140 to lmp-mr1-wfc-dev

Change-Id: I21ffad3247858dc072964a5fa4beb609010c2b1a
services/core/java/com/android/server/am/ActivityStack.java