summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Felix Oghina <hackz@google.com> 2023-05-19 19:28:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-19 19:28:53 +0000
commitf5344bacc2c7ff9ae38f2dcb5e424ec5931112eb (patch)
treed86ebb738d49409023e92e0082ed35016b2fc784 /libs/androidfw/AssetManager2.cpp
parent5455d69108e9517b0d9200e93bc32a1e8727c1fc (diff)
parent535e6b4cc50c59860bc92692c65d4b087c4cc3c9 (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: I02fa4997c50130709892752d9b73502e9f2140e8 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