summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-03-06 15:25:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-06 15:25:07 +0000
commitea6c2789c25622d0badc52af803dd3be8c02168e (patch)
treee6a5bd72223f256ba2cb72c076f5f5ef2368bb3d /libs/androidfw/AttributeResolution.cpp
parent7f180751404437f2380fc7735b84a136ea976969 (diff)
parentb4cb7e1035a4077a5dcb90bed90b181e3579f298 (diff)
[automerger skipped] Merge "Limit the number of shortcuts per app that can be retained by system" into rvc-dev am: 15ae228ddb am: 1d4b958078 -s ours am: b8f5a215f2 -s ours am: 0ffd1da0c3 -s ours am: b4cb7e1035 -s ours
am skip reason: Merged-In I001c7a87b62aefa9487bf8efaf3cd02d7cb21521 with SHA-1 94437e989c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21564438 Change-Id: Ibeb4e0bd15ec170f543d5b03c035212b46c95054 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions