Commit 64ac336c authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

Merge "Do not abort if we fail to allocate a thread-peer on shutdown" am: 1530591d am: 104b0cc3 

am: eb6012a0

Change-Id: I366b083542ebecabd9e0c270aa82b8342e4d71ff
parents 838be250 eb6012a0
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