| commit | fa4455a1bb5f124d485aaff2067ec06d3e4cd688 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Wed Jun 22 12:40:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 12:40:41 2016 +0000 |
| tree | 2d2dd20ff8610e2217d9f9a0e4004b964ab30701 | |
| parent | 35d07d99e086f8bd049e52a5c7f58ba80adeb094 [diff] | |
| parent | 39c5f9f02067e877eec64a86266129a981bab9f9 [diff] |
Merge \\\"Don\\\'t allow showing an activity if user is stopping or shutting down.\\\" into nyc-dev am: 2058553b8d am: ea600f9a12 am: 39c5f9f020 Change-Id: Ifd0df3a3e18f475347fee163ce002a18bca460ac