summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Michael Mikhail <michaelmikhil@google.com> 2022-11-10 18:52:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-10 18:52:06 +0000
commit086746afdc9124ba884811836fc0ba1b695eaaeb (patch)
tree48365cfec752341c8137b44b969c6b5eb9ed080b /libs/androidfw/AssetsProvider.cpp
parent0dc991e0555fba69f705e4ec52686c8185dc03c3 (diff)
parent38a88cca0a6605ebb9c09f0a6ffd2ecbb7936b4e (diff)
Merge "[Media TTT] Displayed View Keeps Screen On" into tm-qpr-dev am: d1cf8adeda am: 38a88cca0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20414076 Change-Id: I1c7bfafcb8d492dee978b1e28af101047435033e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions