OSDN Git Service

[automerger skipped]Merge "Add new trace tag for AIDL." am: fe3877f140
authorMartijn Coenen <maco@google.com>
Mon, 26 Mar 2018 20:38:34 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Mar 2018 20:38:34 +0000 (20:38 +0000)
am: c040ffd288  -s ours

Change-Id: I6e5fb41fc029498229f273e02d6c039b539cafbf


Trivial merge