OSDN Git Service

am efb4a3f6: am 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish alread...
authorWale Ogunwale <ogunwale@google.com>
Tue, 14 Jul 2015 16:52:05 +0000 (16:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 16:52:05 +0000 (16:52 +0000)
commit885e53a6bd635435260edd719b644d4586529a2f
tree78ad234ff8e4263fde580c2892a6893fbfce400e
parentf91e6ff1d2ea9b5610de8dae852a75fdf99c4be8
parentefb4a3f6d2f77e6fff62b2c6f83c5c8497dc133c
am efb4a3f6: am 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'efb4a3f6d2f77e6fff62b2c6f83c5c8497dc133c':
  Finish already paused activity if it should be finished after pausing
services/core/java/com/android/server/am/ActivityStack.java