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

am: 35060e1034  -s ours

Change-Id: I12b1a4ef5580fca18957c1e0bbfe31f2c6a1010b
This commit is contained in:
Narayan Kamath 2017-07-25 15:24:17 +00:00 committed by android-build-merger
commit 492ec06266

Diff Content Not Available