summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Felix Oghina <hackz@google.com> 2023-05-19 19:49:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-19 19:49:42 +0000
commit415ed5858c0104ccdb31e00a2ce1fb195cbb71b1 (patch)
tree5f7a7f645361e533ebbc5a5b1c02e78fffa28189 /libs/androidfw/AssetManager2.cpp
parenta962100ac1d975ab805f90782b994d276a2f102e (diff)
parent90095e3dd2912c813cc020e64073fd4894f3f1c0 (diff)
Merge "Revert^2 "[hotword] remove exemption for pixel devices"" into udc-dev am: 8e3c3bd264 am: 90095e3dd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23260396 Change-Id: Id986dac42dd4e520a3cce9d94e316c4f2bcc3962 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions