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