OSDN Git Service

Merge "Ensure state transition of paused activity." am: c2b9c5388a am: 11695e8081
authorWale Ogunwale <ogunwale@google.com>
Wed, 21 Oct 2015 16:47:18 +0000 (16:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Oct 2015 16:47:18 +0000 (16:47 +0000)
commitb3ad483f45b11a574a124f38c9febd13559e45f5
tree26a566c59dbd40bd1900bbed4f460a301592d8e3
parentd2e6907eaed85d49ec507788a2441e817997c336
parent8d16a3ddeac89c426c0965d792df63750a35460e
Merge "Ensure state transition of paused activity." am: c2b9c5388a am: 11695e8081
am: 8d16a3ddea

* commit '8d16a3ddeac89c426c0965d792df63750a35460e':
  Ensure state transition of paused activity.
services/core/java/com/android/server/am/ActivityStack.java