am 23e9c7b4: am af38d896: Merge "ART: Use enums in Trace"

* commit '23e9c7b4971b6ca61d3837da66f70b43d4a024ad':
  ART: Use enums in Trace