commit | 34fe37c1d00d51b3c17dd218c73f6f706772fdbe | [log] [tgz] |
---|---|---|
author | Nicolas Prévot <nprevot@google.com> | Wed Jun 22 12:45:10 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 12:45:10 2016 +0000 |
tree | 2d2dd20ff8610e2217d9f9a0e4004b964ab30701 | |
parent | fa4455a1bb5f124d485aaff2067ec06d3e4cd688 [diff] | |
parent | 7c6dbddce6e60b0628a35acbded61d3b8691e8a2 [diff] |
Merge \"Merge \\\"Don\\\'t allow showing an activity if user is stopping or shutting down.\\\" into nyc-dev am: 2058553b8d am: f5cf319dc9\" into nyc-mr1-dev-plus-aosp am: 7c6dbddce6 Change-Id: I39d4fc3fd95704b75162ad414980a3ba1c7e2ee0