tree f30e7c533ddf7862900c4b601e9fa04ad9f80940
parent 0f82e46fb63cf5cc977bfcc93fcfe82d44048d4b
parent 1197c16ea7773dd69d0c32e6010263fc9f2990e2
author Wale Ogunwale <ogunwale@google.com> 1474581936 +0000
committer android-build-merger <android-build-merger@google.com> 1474581936 +0000

Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0b8
am: 1197c16ea7

Change-Id: Ic0eab67c6a23a22ac63da2a2a74ac168e9a0b325