summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Pablo Gamito <pablogamito@google.com> 2022-03-22 11:37:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-22 11:37:08 +0000
commit47cf566794d917934f6b640676ae1a91d39aeba6 (patch)
tree1f98ace14991a1edbd537934bf5d19e3063bb902 /libs/androidfw/StringPool.cpp
parentb6b89a1d1d496aaf1b07e3d4d54506bb0aa5cf33 (diff)
parent0710c69c9bfc744985857a292b5d0e9bce395ba8 (diff)
[automerger skipped] Merge "Don't increment colorLayerCounter on surface migration" into sc-v2-dev am: c6c53dbf39 -s ours am: 0710c69c9b -s ours
am skip reason: Merged-In Ifc93d5482bad9591e942e4be91e0039daae743b1 with SHA-1 6a1d698ace is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17255341 Change-Id: I86714fa8c22eea054cda9287d88844b94a0aa1cb
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions