tree 564250308b60c27cb42e7f8e07f82f6b83267f22
parent 22c5e80458b2b110615180ea4f4e43afe2fc4101
parent 49e5109de586147019fd06fa4efc904218782424
author Narayan Kamath <narayan@google.com> 1495190659 +0000
committer android-build-merger <android-build-merger@google.com> 1495190659 +0000

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

Change-Id: I638b12e7f1ef14cb3603f4e0adf02fc5a8d35555