OSDN Git Service

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

Change-Id: I53e9da8fa83f5c18099d9edd4b6902fe820e5f8e


Trivial merge