| commit | cc1f85a49a632b032ca71c4543086d8fe3a95c4c | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jul 25 15:21:37 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 15:21:37 2017 +0000 |
| tree | 5055d35eff6654f2c2c71dc8b73962a76a7d0670 | |
| parent | 35060e1034ca0d75c6c45bcb7de011495efc8818 [diff] | |
| parent | 8df2973166709b7957a880fe2412854f61ce8ced [diff] |
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 Change-Id: I63338c59f4c27efeccb29ebfc98ddac826ccc439