Merge "atrace: add database tag"
am: 8b9c0e1af1

* commit '8b9c0e1af14bf07b216edd1b995048790ddabaca':
  atrace: add database tag