summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Thomas Nguyen <tnd@google.com> 2022-12-09 17:55:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-09 17:55:14 +0000
commit49f93242506ff99b2e9a9194d296598d31a4110e (patch)
tree149bc55f2378ed24642424fe564d6a175b184ba9 /libs/androidfw/StringPool.cpp
parent697e6f621c545235780c7a002cd0bca9975e5d9c (diff)
parentfd0e7112bc1a025a8f28155092ead8641fde26d1 (diff)
Merge "Make NETWORK_RELEASE_TIMEOUT_MILLIS configurable by carrier" am: 99f5d0a07d am: fd0e7112bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2334667 Change-Id: I42aa8eabd5d0ff5ebc7ce9125d98f35ff43f688b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions