tree 46cb081dbd3e6818c4379b93b4d266d7e618c2d3
parent 96c4ee05b0190defd7a7c5e236a93038749e6a93
parent 8095a83b370c44d3c19e2ec54564a9201aa637de
author Santiago Seifert <aquilescanta@google.com> 1575984266 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1575984266 +0000

Merge "MediaFormat: Add ENCODER_DELAY and ENCODER_PADDING"