Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 32caee0675
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610 Change-Id: I9896720132bbfa986d58b9156ae0b05a08db0431 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: