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

am: f7a1378384  -s ours

Change-Id: Ieb10fb76f22d7047b6430691918d53d07e8eb0f9
This commit is contained in:
Martijn Coenen 2018-03-26 20:39:50 +00:00 committed by android-build-merger
commit f733da8e91

Diff content is not available