tree 6884c0f6fea1b39aff332901c0313d73dc5827d9
parent d865b74f92fc2fc1dab95183e3de4c3021a9f7a6
parent 1a3e35fba27babff86bdaa960e044226a9f9e066
author Elliott Hughes <enh@google.com> 1532744613 -0700
committer android-build-merger <android-build-merger@google.com> 1532744613 -0700

Merge "Fix <android/trace.h> doxygen formatting." am: f8844c97ee
am: 1a3e35fba2

Change-Id: Ic7e31bc00ea5625dfabd68d67757f9fe3ddd6b12