tree e791c2cb89d2b3b513b182dd881342c19f19b8e9
parent 73bf7a040ffc500ae9339bd9e71ab8b06f4839c4
parent dd2ded17b9dbaf7aa61f96259577b661928b4020
author Elliott Hughes <enh@google.com> 1532737766 -0700
committer android-build-merger <android-build-merger@google.com> 1532737766 -0700

Merge "Add availability information to the <android/trace.h> docs."
am: dd2ded17b9

Change-Id: Id5259d4656d8c4026c0d3535139b9c8c3ba21fc2