tree 7b8e60823b29032df827c55fb026dd936f4a95c0
parent 2a618f079cca2fb2bae228065bc81f94641f12a8
parent f8844c97ee7b3b1054230c42bc11fab1df9bf002
author Elliott Hughes <enh@google.com> 1532744359 -0700
committer android-build-merger <android-build-merger@google.com> 1532744359 -0700

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

Change-Id: Ib668bbcd3592eda96a2b6880acf34092e6bb8f1f