| commit | 0c146fb87b24c325a094765bac0b0272dad8ebbb | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:52 2020 +0000 |
| tree | 6ace48e245836b349db1f128df56253566d49418 | |
| parent | c06bc04f21c7d66a64ffab1f1848af7e9c2d506a [diff] | |
| parent | 4c3beed6d54172b7baaea53c16ae99141b1508d7 [diff] |
[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s ours am: 36a4a0ba8e -s ours am: 4c3beed6d5 -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: I0e5e5719d5779c7ef9424e64a741c4b15a1de123