tree 23c7d19ea1ecc21853fa5aa1518f5df653901a0b
parent 7349045bf622eb87c159afa9acc3b9039f3215b8
parent 908b70ed4cb2acf053dbab13bb6d4ecb4772c2cf
author Elliott Hughes <enh@google.com> 1532744895 -0700
committer android-build-merger <android-build-merger@google.com> 1532744895 -0700

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

Change-Id: Id67eb36ee58e0fdb2829fd9ef65f39d34ec0cdbb