OSDN Git Service

am acb78d55: am 6a231f48: (-s ours) am dad62b9f: Merge "Finish already paused activit...
authorWale Ogunwale <ogunwale@google.com>
Thu, 27 Aug 2015 16:04:22 +0000 (16:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:04:22 +0000 (16:04 +0000)
commit5f135fb02a91f9923becb5e3091488088257cc07
tree4e9052ca12f00de06c77cb3ce93ab1eb160e691b
parent8ad04596c041ff1f02d9a3627ec8a90b20e814ae
parentacb78d55ab039891b2bd2cbcbd3c8ecc877ea526
am acb78d55: am 6a231f48: (-s ours) am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'acb78d55ab039891b2bd2cbcbd3c8ecc877ea526':