| commit | ddce581a6316aa06cb0bbeb0aa875ed022274cd1 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed May 31 12:29:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 12:29:20 2017 +0000 |
| tree | 5c532ddda94f40c5fbfa1ff501184ec8832dfc2e | |
| parent | eca6b3f0ea608f7886497bd08a986a94a6469ee6 [diff] | |
| parent | 6ca71ad13721fe64ba87cadd4f88a304b07665e4 [diff] |
Merge "tombstoned: allow intercepts for java traces." am: 1e63347425 am: 907a666e22 am: 6ca71ad137 Change-Id: I1797a7e47d2451858b3a130721b84e159a9f2843