Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev am: 53ce94588b -s ours am: 8df2973166 -s ours

am: cc1f85a49a  -s ours

Change-Id: If2dbbb887ebb2bdac7c6bfc352adf17b9eba9ff3
This commit is contained in:
Narayan Kamath 2017-07-25 15:24:33 +00:00 committed by android-build-merger
commit 9de83f7370

Diff Content Not Available