tree fd6631bb158b48c2b229deeeb422f2393fc8caf4
parent 21bc2b877c98f2c5b6dc60b266b595adf958ba65
parent fa4e7db9a0e82dfa975146b7b8ece2d653640290
author Dongwon Kang <dwkang@google.com> 1571165484 -0700
committer android-build-merger <android-build-merger@google.com> 1571165484 -0700

[automerger skipped] Merge "Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca" into qt-r1-dev-plus-aosp
am: fa4e7db9a0 -s ours
am skip reason: change_id I8d4279af883198e1276955831ecb9e3ae7a6e0af with SHA1 097fc5fe58 is in history

Change-Id: I0285d55d6d9d1180150641b593104ea95b83d02a