tree a24935a9fc79ea48b624536f052d86ca7aa614d2
parent aaf361b75114494490c45234c66d7ecbfe0d2c4b
parent 548b9b40975b0de62ce6c6dfafcb7b407c72fab9
author Nick Desaulniers <ndesaulniers@google.com> 1570557477 -0700
committer android-build-merger <android-build-merger@google.com> 1570557477 -0700

Merge "[media][sfplugin] fix -Wdangling-gsl" am: d3dd89caab
am: 548b9b4097

Change-Id: I3b2c2deef4e688a4966f23ab30eb97ee1a3e1815