am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640
Change-Id: I19533b5c7716fd251c36c104cf97e948d73735d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640
Change-Id: I1d04af405cd3781d11ed41f96755784e3b73524e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642
Change-Id: If3095b66732503a47967798c3bad4c5a20f6f11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cf141c714f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643
Change-Id: If72c52599c88f034912524abac6a1cae4f0f7e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640
Change-Id: I5b07f584bc4c2d8a241981b70cc891f2c8b61fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640
Change-Id: Ie7a8385adde4f07fb5e7e7d1e7fc586c7d730d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642
Change-Id: Icf0b65e3a9bc2ee93deb85823aff6b6f773169d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 0c4954dd87 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497644
Change-Id: I25ec900e95aa401d61b6685a5355d81d2693f561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642
Change-Id: If658ec94a0c6db63a0818039d89f556178c71aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This allows callers to conditionally use new API features without
breaking compatibility with the earlier versions of the library.
Bug: 261048742
Test: atest android.media.encoder.cts.EncoderTest
Change-Id: Icdf18317e120caf8be750a839ae75a6ac8eba142
Signed-off-by: Zhang Ye <haocheng.zy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Change-Id: Ifc1c8801d885b0b4ac1bf91842830ab650780328
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004
Change-Id: Idfdf539fd4874772c3bef65519ddaec869361b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004
Change-Id: If0480b81892c6f79f4a6c3cd58f523d6ae82d127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004
Change-Id: I32589f68cdaf3ae48930b21947e79d615b4d41b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I4df938df7886adc58185586190e27bcd16e17966 with SHA-1 1f830f7196 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2126004
Change-Id: Ife4349f0a7ab64120e0bb4fba0c6e1b72465ad49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>