| commit | 7e60332c0a59f91466dc91fa00c4fb5e5c191c99 | [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 | bfa7ce59c44afed097d514e5de8f7b8a95fafa17 [diff] | |
| parent | ddce581a6316aa06cb0bbeb0aa875ed022274cd1 [diff] |
Merge "tombstoned: allow intercepts for java traces." am: 1e63347425 am: 907a666e22 am: 6ca71ad137 am: ddce581a63 Change-Id: Ie70a7ebcc9d2a4c257b5b9a580ca41672de6510d