Commit 629d1afd 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:... 

[automerger skipped] Merge "Revert "Require CONFIG_DETECT_HUNG_TASK"" am: c4163554 am: c10df89f  -s ours
am: 5d55e2ad  -s ours

Change-Id: I5d3d5fe61080e789ab018ee561f1d7a7d697e0d5
parents 7f4d076f 5d55e2ad
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