tree 1a9036373dffb9cd51b12f577c74a691e4a126fd
parent 64b4621f4f54d7662561f52b17d995d4029cd7fa
parent d865b74f92fc2fc1dab95183e3de4c3021a9f7a6
author Elliott Hughes <enh@google.com> 1532738271 -0700
committer android-build-merger <android-build-merger@google.com> 1532738271 -0700

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

Change-Id: Ie311078c896f1f8afe6ac55423283d1d924e6199