[automerger skipped] Merge "MediaCodec: report message from CodecErrorLog" am: c33f81fff5 am: 7778c72b37 am: e0cd633e76 -s ours am: 2106b59c52 -s ours am: 31cf00e9d0 -s ours
am skip reason: Merged-In Idd1adae38328ada955999a8cecb7ce14c75ea52e with SHA-1 cc1fb7b1be is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407712
Change-Id: I0754440a51d54ef054c58d7c1bf4578f6032e884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: