summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Hall Liu <hallliu@google.com> 2021-01-28 22:49:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-01-28 22:49:22 +0000
commit0fdcbb8cfb99cbd96847ee12882fa8b656c9cbae (patch)
tree623b36fd0672bcafd93aec0974757373ff754cf9 /libs/androidfw/AssetsProvider.cpp
parente6a05d71670afce926fb7e3baf9f03ff6dec3f60 (diff)
parent8fee7eaa81dbfeca3ca655e10c59fcc1bbb36031 (diff)
Merge changes from topic "composer-final-integration" into sc-dev
* changes: Rename TelecomManager.EXTRA_INCOMING_PICTURE Add support for integrating call composer
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions