tree 67fb766facdb64dfee0456c23fa764523ba4f9a1
parent 8cdef644b3fe20d27ce96a3ecdca25e3f88808b1
parent eaff9c981cf03c85b30eef54a19017c803bd6b26
author Narayan Kamath <narayan@google.com> 1495190358 +0000
committer android-build-merger <android-build-merger@google.com> 1495190358 +0000

Merge "tombstoned: Support java trace dumps." am: 24bccbcf98
am: eaff9c981c

Change-Id: I8b01cfc2fded72aef274e620c44970e0f67d146d