summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Felix Oghina <hackz@google.com> 2023-05-19 20:19:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-19 20:19:52 +0000
commit618f77b32cb203decaff747be1dab5400d72aad5 (patch)
tree0104bac47ab40bc0371c25bf05bb4f57826ad67c /libs/androidfw/AssetManager2.cpp
parentdcacac9833e00edb8f578e4d39962582b2a6a833 (diff)
parent3d86a68bf25cc9fa206390477eeda8979c6679f7 (diff)
Merge "Revert^2 "[hotword] remove exemption for pixel devices"" into udc-dev am: 8e3c3bd264 am: 90095e3dd2 am: 415ed5858c am: 3d86a68bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23260396 Change-Id: I0644473c282621782bd3a62b1e539d0ad9d3ed0b 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