tree 790dca3610d237480815abead3365ffe20b7673f
parent 691285b01d7a1328492c608c997521c048461be4
parent b882410806003880c8cbae32d462adb951faa48d
author Pirama Arumuga Nainar <pirama@google.com> 1547706349 -0800
committer android-build-merger <android-build-merger@google.com> 1547706349 -0800

Merge "NFC: Switch ATRACE_BUFFER_INDEX to be a more friendly macro statement." am: 9c45a2f391 am: 527710b285
am: b882410806

Change-Id: I0482ba483d9e05dd97abf25c013f930f9146b2f9