commit | d25af2f1b7a6ca82818cb73cdd179aa20ffeba74 | [log] [tgz] |
---|---|---|
author | Oriol Prieto Gascó <opg@google.com> | Fri May 03 14:52:51 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 14:52:51 2024 +0000 |
tree | c56e95694b337779398ed022781c25c22a4eb3a8 | |
parent | df8f5a2ecb49cf70e057101ac795c7f69ec17339 [diff] | |
parent | cdf979a60020c4bfb323228db6b08fd25e63aea4 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main am: d221c070d2 am: cdf979a600 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3068562 Change-Id: Ia4834a8048650aa1d72be8d10774567a3931c454 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>