tree 9b03adc30b815bb4c6a188f6e5184959f2d4a857
parent b81e0dc5289c39c7fb77c963726caeba70b0ea91
parent b7ca9d099becb859d17f74758195c90d17a20b72
author Marco Miller <marco.miller@ericsson.com> 1573250615 -0500
committer Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> 1573577488 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add support for NoteDb

Change-Id: I676633e5f075afb353e8f164152482aa72a52ebe