commit | e36b284d7a14715fccf0e7c7c10b46b7e44e1eec | [log] [tgz] |
---|---|---|
author | Dongwon Kang <dwkang@google.com> | Tue Oct 15 12:14:31 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 15 12:14:31 2019 -0700 |
tree | c6724c2c5acca35fc4ee33db523d5f1cf20447c1 | |
parent | 4c26e5e19df66fd66def2b01e91d7709d69ff026 [diff] | |
parent | fd549e6e16d9be9cf3f901f8c59cf2af6e9dd39e [diff] |
[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: fd549e6e16 -s ours am skip reason: change_id I8d4279af883198e1276955831ecb9e3ae7a6e0af with SHA1 097fc5fe58 is in history Change-Id: Ib97609348774be008a8038d85a1f95c53e1fad3d