Merge "cutils: trace: add DATABASE tag"
am: 461a29540c

* commit '461a29540c01b44f07fc26ccb0d5bc7d0d92a974':
  cutils: trace: add DATABASE tag