commit | b25a9c1ab5a3848402117ec6946d49103913a368 | [log] [tgz] |
---|---|---|
author | Robert Horvath <robhor@google.com> | Mon May 30 18:35:48 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 30 18:35:48 2022 +0000 |
tree | 8d97c2d6a8313dedff17d4a789aab898ae0010eb | |
parent | 953a655ec22879b0e85cbb18ec4a8328b1a26b8f [diff] | |
parent | 2e3a324fcf19ca15f0e66fb56d02bd1381f2b427 [diff] |
[automerger skipped] Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a am: e9bb088522 -s ours am: 2e3a324fcf -s ours am skip reason: Merged-In I8924ebb7871da432b0e4e49c465a0c43e515ca4b with SHA-1 a7b00c574e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375274 Change-Id: Icaabd9f3b44bcc21dc8a3c024fad4452603fc345 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>