| commit | d3b674afb9ae1da1971e8ffab3906a2c7d23579c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:09 2020 +0000 |
| tree | 95582df40daa60e2bacb0d2ef782fa083372aee5 | |
| parent | f93e0b5bba0aa7d92c8f9203f60075b371b63a69 [diff] | |
| parent | 5746f5f13ef4cc6f412666771438859fef239fdd [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: f7f95ead5d -s ours am: 4cbbdf658d -s ours am: 9732271080 -s ours am: 5746f5f13e -s ours am skip reason: Change-Id I96e67a481b839c9de4a5fea0d7a540b93441133c with SHA-1 9c78c5c239 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1430118 Change-Id: Idafd3a8cdabeb5ba4aca4d79667cf9d656f96ae3