commit | d1286fcea162163e92900090f86bbe692c4705b1 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Wed May 31 12:07:04 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 31 12:07:04 2017 +0000 |
tree | 85e5e4d1d8412d53f87b3770f255366568ac0f02 | |
parent | 79746b5be9d1f29047ca9bb80fa1a35850520610 [diff] | |
parent | 1a27e4e49064a353e0bae6197d4a489820563505 [diff] |
Merge "tombstoned: allow intercepts for java traces." am: 1e63347425 Change-Id: I326308ed1fa4bdbb3380a19403fecb93386ec811