summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Collin Fijalkovich <cfijalkovich@google.com> 2021-10-13 13:45:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-13 13:45:21 +0000
commit57eabfd5be84eaeff3c4ad8f717ef535525cfeea (patch)
tree2ec44070d7128cfb6fdef2e494152dc3823f1cce /libs/androidfw/StringPool.cpp
parent7d3e204a101e528502c36aa3a649f9c55d4f7dad (diff)
parentf34f93b815e319c951f575f3242eab944e56da5f (diff)
[automerger skipped] Disallow overlays for ResolverActivity am: 718c60bea7 -s ours am: 4f30365204 -s ours am: f34f93b815 -s ours
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 34534e1fd2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15956277 Change-Id: I6d89246e468e15b9f33186bf6cd11d04463ce777
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions