tree 985a54bdcb2df2380a2ec0738cba5869ed7b70f8
parent d07eeb453f9bc1cb05fb03391a6a9a1dab2f6fae
parent a98beef0cf4e9887d179bf3725c8ea77c1b11b86
author Jean-Michel Trivi <jmtrivi@google.com> 1545877899 -0800
committer android-build-merger <android-build-merger@google.com> 1545877899 -0800

Merge "Encoder returned an error while explicit flushing" am: 2f5612ef84
am: a98beef0cf

Change-Id: Ie8198a53d1666d97ae586c9984b8ffcdb6c528c7