| commit | 4fe84d612911ce9d87d171fccb35adf0a80fc863 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Mar 26 20:39:22 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Mar 26 20:39:22 2018 +0000 |
| tree | 86982e3278b692ad29f3b7e628c9c35b5af58324 | |
| parent | 617877c1e3c40cb79c78af187589b6159d946d12 [diff] | |
| parent | 82a2cb3cdefc78fa2d4994de862f16e90c38cbc3 [diff] |
[automerger skipped]Merge "atrace: support new AIDL trace tag." am: 2e8ae4313b am: 82a2cb3cde -s ours Change-Id: I1881a0ff5eabfccafd875d77e44b5a2b9433bac9