summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Felix Oghina <hackz@google.com> 2023-05-19 19:53:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-19 19:53:17 +0000
commitf00f18d61d4b56b9a8bc3b4e27c255594ee64e3c (patch)
tree69c158d923246fe7ff74f602630f79ea110e1e84 /libs/androidfw/AssetManager2.cpp
parent36685862c743a8a001aa0401536f91a449e098e4 (diff)
parentf5344bacc2c7ff9ae38f2dcb5e424ec5931112eb (diff)
Merge "Revert^2 "[hotword] remove exemption for pixel devices"" into udc-dev am: 8e3c3bd264 am: 535e6b4cc5 am: f5344bacc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23260396 Change-Id: I943e4413e9562ba4271296aa8735272d3ab2395a 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