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