summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath2017-07-25 10:13:24 -0500
committerandroid-build-merger2017-07-25 10:13:24 -0500
commit385a5dc03adbf780f5b4f3d1a0038c4036b24577 (patch)
treeb3842dd4e5945437c2eedfd42deb602f5ebbd592
parentda4e68944e5d1db9855c9fc44d7470e279e9e0eb (diff)
parent53ce94588bab2a958fda0667927a327ef344dc14 (diff)
downloadplatform-system-core-385a5dc03adbf780f5b4f3d1a0038c4036b24577.tar.gz
platform-system-core-385a5dc03adbf780f5b4f3d1a0038c4036b24577.tar.xz
platform-system-core-385a5dc03adbf780f5b4f3d1a0038c4036b24577.zip
Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev
am: 53ce94588b -s ours Change-Id: I5fce7331aae05080d8a68155500ebda45dfe7246
0 files changed, 0 insertions, 0 deletions