diff options
author | 2023-05-19 19:44:32 +0000 | |
---|---|---|
committer | 2023-05-19 19:44:32 +0000 | |
commit | a962100ac1d975ab805f90782b994d276a2f102e (patch) | |
tree | 5f7a7f645361e533ebbc5a5b1c02e78fffa28189 /libs/androidfw/AssetManager2.cpp | |
parent | b0b2527cee0eff0b45423348b9170e9a3bb8cfbf (diff) | |
parent | 535e6b4cc50c59860bc92692c65d4b087c4cc3c9 (diff) |
Merge "Revert^2 "[hotword] remove exemption for pixel devices"" into udc-dev am: 8e3c3bd264 am: 535e6b4cc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23260396
Change-Id: I83c060dd5362d8ebceb1c3ef70376e4a78450a6b
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