summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author tomnatan <tomnatan@google.com> 2021-10-25 12:12:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-25 12:12:14 +0000
commitd6c2dbdb6e6bdccf7b5a28a1c2f0452654fc7264 (patch)
tree4d2dd13dfe9d0fbcaa31ed4e856c2e75d182511b /libs/androidfw/StringPool.cpp
parent15a5f96114dbc64a2a9705b6f8534efdef72bf69 (diff)
parent1cd6219abb3a4c603811d84ca698e1a8ebf65cba (diff)
Fix merge issue with ActivityInfo#getMinAspectRatio am: defbe2ff4a am: 1cd6219abb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16115300 Change-Id: I93964847ea4dbb63ea18d8bff99c811e1d66f306
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions