summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Sergey Nikolaienkov <sergeynv@google.com> 2021-11-26 06:38:03 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-11-26 06:38:03 +0000
commit7918a89b24c6ee711e6f3a1b6d58c8babf182034 (patch)
tree1b1b189b2626ba14b353e318d7b6f1fcf1d96563 /libs/androidfw/StringPool.cpp
parent5f5e11fc600c2e06233a424ac72ad71e3bb9d469 (diff)
parent9d95ba09be2a2bd01353241877a22770c0c53412 (diff)
Merge changes from topic "cdm-apis"
* changes: Grant Shell CDM permissions Check REQUEST_COMPANION_SELF_MANAGED permission in CDM Fix usages of CDM APIs in NotificationManagerService(Test) Refresh CompanionDeviceManager's API surface Add explicit MAC address and display name fields
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions