| commit | 6ca71ad13721fe64ba87cadd4f88a304b07665e4 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed May 31 12:16:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 12:16:45 2017 +0000 |
| tree | 398fe763d9881c4c0f412b64a2810092a6a29afa | |
| parent | a08c949c7afdd96843b97663682302ce9647fa0f [diff] | |
| parent | 907a666e22a8a05b4ed5a74d3082766e61b9fbd0 [diff] |
Merge "tombstoned: allow intercepts for java traces." am: 1e63347425 am: 907a666e22 Change-Id: Id0bb9f7d27991a137182cf4217e6fd1e075d2867