| commit | 691c1783d1a40b500bd8afc11efacaf1388b682b | [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 | d1f7dfafba1cb679a22da6552e369fecd56feee9 [diff] | |
| parent | cfa81607e70ef2479ddfb2e5d906b7e58d8e8b4d [diff] |
Merge "tombstoned: allow intercepts for java traces." am: 1e63347425 am: 907a666e22 am: 6ca71ad137 Change-Id: I1797a7e47d2451858b3a130721b84e159a9f2843