| commit | f86b91009de3bb164087c429231513a60df4079a | [log] [tgz] |
|---|---|---|
| author | David Stevens <stevensd@google.com> | Wed Aug 23 03:38:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 23 03:38:56 2017 +0000 |
| tree | b816afa713bf9fc0f6f022dcccf5e08d7db0b684 | |
| parent | e83ab7fc07fa24f43f40f17428ae4b9c20d64b5f [diff] | |
| parent | 7f792333c2debd624e021b1f6d4f78ad3ffb4c3b [diff] |
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev am: bc06e43c49 am: 7f792333c2 Change-Id: Iad9fec571e686cec9ab1cc7164a798e5c5e83eca