| commit | 31961c69913ed4d4047531d46497dc32074038ba | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:23 2020 +0000 |
| tree | 6ace48e245836b349db1f128df56253566d49418 | |
| parent | 263575f7769707afd3a593dbe1e8cf75c98d9447 [diff] | |
| parent | 0c146fb87b24c325a094765bac0b0272dad8ebbb [diff] |
[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s ours am: 36a4a0ba8e -s ours am: 4c3beed6d5 -s ours am: 0c146fb87b -s ours am skip reason: Change-Id I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e with SHA-1 ce53e79382 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1422136 Change-Id: I27fb7bf50e63df06efd5ea150805fbba2451bd70