summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Caitlin Cassidy <ccassidy@google.com> 2022-08-02 21:38:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-08-02 21:38:52 +0000
commit91b6e7c0ac4be29125093e52bb469ab97cca46b0 (patch)
tree1b8347c2fe00ac7fef4d2d2a0e5dcfe34bdd274b /libs/androidfw/StringPool.cpp
parent111c26fe78514c05e65b2fea258bf604e0271368 (diff)
parent7c4c5375aa677bff5750a4b4452203d853bf0305 (diff)
Merge changes I0d063c25,I27d2e4ae,Ieef1681c into tm-qpr-dev
* changes: [Media TTT] Remove the tap-to-dismiss option for the phone chip. [Media TTT] Increase the default timeout to 10s, and the timeout for the "transfer started but not finished" state to 30s. [Media TTT] Don't wake the screen if the screen is already in dream state.
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions