Commit 2136bd7e authored by Adam Vartanian's avatar Adam Vartanian
Browse files

Merge upstream master 

Main change is to remove CompatibilityCloseMonitor.

Bug: 122881655
Test: cts -m CtsLibcoreTestCases
Change-Id: I197b26118b7cfb93c99b2bfdaf9a6f28b87dffe4
parents e307910f ae12b7d3
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