tree b0ad57ae1c02e3ce96ee34f4e06708054c79f3a1
parent 266576c1a63f7be4d0ca9351dbb8c80d539be5f0
parent ec565efe706746157883822a93470cb3ef0fe6c0
author Wale Ogunwale <ogunwale@google.com> 1436834362 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436834362 +0000

am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'ec565efe706746157883822a93470cb3ef0fe6c0':
  Finish already paused activity if it should be finished after pausing