tree 41d76f909849dbc2517c6057c5f0219672ed4a9f
parent b67011f662f6a4dbb4cd777b621cbca64218306f
parent d026b4460b77a775b148a937f8618222986e1e7f
author Wale Ogunwale <ogunwale@google.com> 1473286257 +0000
committer android-build-merger <android-build-merger@google.com> 1473286257 +0000

Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev am: 36c4fc9779
am: d026b4460b

Change-Id: Id7ca4b27fdc5a2cc6a0b9e40f6952fe504718353