summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Lajos Molnar <lajos@google.com> 2021-10-26 23:16:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-26 23:16:19 +0000
commit04ab4930c0629461469f8b196b9c780d65805072 (patch)
tree77173f6efbd08d6d02c551a739b8e8c7f71f5bc8 /libs/androidfw/StringPool.cpp
parentc1ceac41b8435bbd44d69356ea13d86c6ab70fc8 (diff)
parent7aa8c12dcff80bb58d99fe2d5b2741568e4761fa (diff)
Merge "media: allow excluding arbitrary codecs from REGULAR_CODECS list." am: 36fb4b48b4 am: 4209666577 am: 7aa8c12dcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1867088 Change-Id: Iee745f46101cac07d3d03aeca72b28b34e015bce
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions