tree b9497f8244441d6df7227dfcd73f0aa81350f58c
parent 466adf2a1b74e4ec204e4852c18d8a5267dd5e38
parent 2f5612ef84892f51cf9c13dd245f4fbf9b4d0ab0
author Jean-Michel Trivi <jmtrivi@google.com> 1545876845 -0800
committer android-build-merger <android-build-merger@google.com> 1545876845 -0800

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

Change-Id: I5cab81980db628f6f4cbe9f0a8bf92d3dd2e76a5