| commit | cfa81607e70ef2479ddfb2e5d906b7e58d8e8b4d | [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 | 922c49864190f0328615f2f17ec42e1d96facc03 [diff] | |
| parent | d1286fcea162163e92900090f86bbe692c4705b1 [diff] |
Merge "tombstoned: allow intercepts for java traces." am: 1e63347425 am: 907a666e22 Change-Id: Id0bb9f7d27991a137182cf4217e6fd1e075d2867