Commit 5d55e2ad authored by android-build-prod (mdb)'s avatar android-build-prod (mdb) Committed by android-build-merger
Browse files

[automerger skipped] Merge "Revert "Require CONFIG_DETECT_HUNG_TASK"" am: c4163554 

am: c10df89f  -s ours

Change-Id: Iacafbcad0ddfe571e258f0c7f77b916ff8065e83
parents daf52b72 c10df89f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment