tree 217ed87e2276b7d2c4bcb7394bec36c1e48f5541
parent f70b45f956e961a028eb0585992fe91d3f8047f1
parent ae1082f6e1c60850f10bdde8a127142fa13b0d02
author Android Build Merger (Role) <android-build-merger@google.com> 1505154700 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505154700 +0000

Merge "Merge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev am: 8af60e4c0e am: 8dd7d067f7"