tree 287955e77a1b24a2d33085a5d83f2192addc6243
parent 43f91fecfa4eeedbc94306158be57552c7b2b625
parent 7349045bf622eb87c159afa9acc3b9039f3215b8
author Elliott Hughes <enh@google.com> 1532738564 -0700
committer android-build-merger <android-build-merger@google.com> 1532738564 -0700

Merge "Add availability information to the <android/trace.h> docs." am: dd2ded17b9 am: 2a618f079c am: d865b74f92
am: 7349045bf6

Change-Id: Iad50a326a3ca0a7404ebdd393310ab0a545e10e0