| commit | 35d87776c4e3ffd7d112f2ce3a66248491965bc5 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:51:01 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:51:01 2020 +0000 |
| tree | 327e763d377be721d140a9968d9c249452ff32f9 | |
| parent | 291cd2df2cfa06b449d22e978ca5490595a8ba52 [diff] | |
| parent | 7221a1de0e68a077fbb5623b0c2f82857238976f [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 5714e607c4 -s ours am: 7221a1de0e -s ours am skip reason: Change-Id Ic5e9d14519f1942a42613b83084c053cb8ca05db with SHA-1 a364a910cf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12578854 Change-Id: If5f438e177b47f026294905f6af0b5bb8b63f482