Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev

am: 53ce94588b  -s ours

Change-Id: Ia2e6b86fbe5096b9419511edf7c3baf78e8aaee5
This commit is contained in:
Narayan Kamath 2017-07-25 15:13:24 +00:00 committed by android-build-merger
commit 8df2973166

Diff content is not available