summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Pablo Gamito <pablogamito@google.com> 2022-03-22 11:33:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-22 11:33:57 +0000
commit0710c69c9bfc744985857a292b5d0e9bce395ba8 (patch)
treec29ab2ef83ded574789c1ca202f93e70103729ef /libs/androidfw/StringPool.cpp
parentcea9746e22bfb4272840967e6ff88a81eccfa005 (diff)
parentc6c53dbf396dac484bbc3d0ccefc0b5bfdf4481a (diff)
[automerger skipped] Merge "Don't increment colorLayerCounter on surface migration" into sc-v2-dev am: c6c53dbf39 -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: Ic62c3d464fcc811aae7d95f103e7a7ac14dff15b
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions