| commit | 158ed9ddba1b9fd55f43d9b30a3ec287f37ae6c3 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed May 31 12:40:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 12:40:56 2017 +0000 |
| tree | af1705ebe6b894d6d3fd68e9af81059ae11b0fa0 | |
| parent | fa0fee35e0a4bb10d0dcddd6fd8aa8ecbdf7b5bf [diff] | |
| parent | 691c1783d1a40b500bd8afc11efacaf1388b682b [diff] |
Merge "tombstoned: allow intercepts for java traces." am: 1e63347425 am: 907a666e22 am: 6ca71ad137 am: ddce581a63 Change-Id: Ie70a7ebcc9d2a4c257b5b9a580ca41672de6510d