diff options
author | Xin Li <delphij@google.com> | 2020-09-11 02:03:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 02:03:01 +0000 |
commit | 4c3beed6d54172b7baaea53c16ae99141b1508d7 (patch) | |
tree | 6ace48e245836b349db1f128df56253566d49418 | |
parent | 9858e4b185ce2ed2f7d863b8061064a261ae87fe (diff) | |
parent | 36a4a0ba8e5639921db7c4e84a0131aa60bfbcbf (diff) | |
download | media-4c3beed6d54172b7baaea53c16ae99141b1508d7.tar.gz |
[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s ours am: 36a4a0ba8e -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: I5a25cbcad3c24d6317caa43c58cb74e6bb76edf1
0 files changed, 0 insertions, 0 deletions