commit | 7221a1de0e68a077fbb5623b0c2f82857238976f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 14 21:18:59 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:18:59 2020 +0000 |
tree | c7ec6e8bb532c691d844b7563515bd3a732717d1 | |
parent | a364a910cfbf49ef13d958c0fa5a66336eb8c564 [diff] | |
parent | 5714e607c4206c406d2da720260c7ca26bcf26b2 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 5714e607c4 -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: I1f0305c9dc6914832f147f12b6ed6ea2cd526209