Merge "Merge "When fork() fails, clean up data structures." into nyc-dev am: f10640adef am: 54659d5f8b" into nyc-mr1-dev-plus-aosp
am: 23bfdaac34
* commit '23bfdaac34bf83430ce7bcb097e63c35b3d79f40':
Change-Id: I0f306e714e4ba5c0d8dd21b44ab76944067d61d4
This commit is contained in: