Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b5b8be9 authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into... 

Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a228 am: 32caee06 am: c46e9f69

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610



Change-Id: I6bbba22597f72283dcc4911d826b5f8dd3b8e953
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca3e7d67 c46e9f69
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment