OSDN Git Service

am 131ff02e: am afa4766d: (-s ours) am 093d8de2: Merge "Finish already paused activit...
authorWale Ogunwale <ogunwale@google.com>
Thu, 27 Aug 2015 16:46:32 +0000 (16:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:46:32 +0000 (16:46 +0000)
commit6fd0415157af1983b394736953e0ead6773a7e38
tree4e9052ca12f00de06c77cb3ce93ab1eb160e691b
parente3badcda0123fefc9ec7916ed084390c016a64d0
parent131ff02e9dcd9010dce67b6d29fc2e06349384c1
am 131ff02e: am afa4766d: (-s ours) am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit '131ff02e9dcd9010dce67b6d29fc2e06349384c1':