tree 051b009c7b740383ccd649909bbea65871e04f64
parent f71624480234e0cb8553f6a62997176f0c45bee4
parent bc06e43c492f1c8b5e7141fc8ffb2b756f987ecf
author David Stevens <stevensd@google.com> 1503455141 +0000
committer android-build-merger <android-build-merger@google.com> 1503455141 +0000

Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev
am: bc06e43c49

Change-Id: I612edfe64cee0f0a192f56177fc7dff8d7ad9e2c