commit | 12be52d083f3658f2fe62dd800117bf07e2fd975 | [log] [tgz] |
---|---|---|
author | Siim Sammul <siims@google.com> | Fri Feb 09 11:13:30 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 09 11:13:30 2024 +0000 |
tree | 0d6604a0855f542da551ed2c73041dc1ed3f37e9 | |
parent | cfd6698a355f1714ae501a3ce1a7a74f49ed2f0d [diff] | |
parent | b07dd5f829e13e01474735bb646b3362673045a7 [diff] |
[automerger skipped] Merge "Set up platform flags to use for enabling proto tombstone" into main am: a779b38091 am: b07dd5f829 -s ours am skip reason: Merged-In I76bd6ca0fd7d97e848784a640d359d3fd009621b with SHA-1 a3e9e1c7d3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2950825 Change-Id: I5bf1e7db3a0670860d818e501f66ffa84ce39afc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>