tree e0a64b992fbbfcb86976eef97ad7e7aec2255e39
parent 123a19bc3af1c4da4faa9f781eaabcd0e9135f9c
parent a35cbafe23b0deb2330b88b70078578bdfeaeeac
author Bryce Lee <brycelee@google.com> 1504028159 +0000
committer android-build-merger <android-build-merger@google.com> 1504028159 +0000

Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev am: 02584a23b3
am: a35cbafe23

Change-Id: I00108fe1963cdd648fc89b89dc59f3086350dd88