am c46e0e43: Merging on top of new sync

* commit 'c46e0e43762debf25e2c10953a0f420850891531':
  Merging on top of new sync
tree: 2a292dbcb85aba631a6eb9158db1b80c21d86bea
  1. libvideoeditor/