commit | b60a8ad449ed875f43d8b0325fa9c729e7c17155 | [log] [tgz] |
---|---|---|
author | Nicolas Prévot <nprevot@google.com> | Wed Jun 22 12:36:54 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 12:36:54 2016 +0000 |
tree | 1493b090a666feadc09d43dd84c2952e7668e01e | |
parent | 1fef349549d7a851d51c77d9e77a08dc00e2a172 [diff] | |
parent | f5cf319dc92a5b9ed6197ee5ecc9eba37eaeb63c [diff] |
Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down.\\" into nyc-dev am: 2058553b8d am: f5cf319dc9 Change-Id: I65ee6db43e3ea7df99bac0edb81a034fc6318984