[automerger skipped]Merge "Add new trace tag for AIDL." am: 80dce0127c am: f7a1378384 -s ours

am: f733da8e91  -s ours

Change-Id: Ifaf108b0b8623344384f9323d18e6c2083145c45
This commit is contained in:
Martijn Coenen 2018-03-26 21:01:39 +00:00 committed by android-build-merger
commit 9fb18de587

Diff content is not available