Merge "Change trace labels" into honeycomb-mr1
tree: 83d3cbfc9efdc945a91d9597f17ec6380ebe3c59
  1. libvideoeditor/