Skip to content
Commit 7f792333 authored by David Stevens's avatar David Stevens Committed by android-build-merger
Browse files

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

am: bc06e43c

Change-Id: I612edfe64cee0f0a192f56177fc7dff8d7ad9e2c
parents f7162448 bc06e43c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment