summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Caitlin Cassidy <ccassidy@google.com> 2022-03-01 15:56:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-03-01 15:56:30 +0000
commitedd81e4e8c9a01f91807480572b8e9cef2f0c4ed (patch)
tree2ddb38ecacdb33f1c5dbe9cbcd6cd3c49db6cd1d /libs/androidfw/StringPool.cpp
parent98e05e000ddfd9f006a38ca9104c4eecfed7928c (diff)
parent2403c96c43e2d07381512a905d7b0eac856b0e85 (diff)
Merge changes from topics "presubmit-am-75f37079dffc432aa517bc8e4eb8269b", "presubmit-am-b883696932b4444b93bf6cb6589993f3" into tm-dev
* changes: [Media TTT] Don't hide the chip if we're in a transfer triggered state. Also give those states a longer timeout. [Media TTT] Add debug logging to the sender and receiver.
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions