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