summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ian Baker <ibaker@google.com> 2022-10-19 10:49:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-19 10:49:07 +0000
commit8640d2a406a440b980d6328738638c51f4047839 (patch)
treec4b8a9004632dd96c7adc7520d21cf7fe522ac99 /libs/androidfw/ResourceTimer.cpp
parente60487c7b66668c82237398f39808e35edf7bcdf (diff)
parent258d8f6321f91dfbd25e03d8066850cd4b512fd5 (diff)
Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes" am: 258d8f6321
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260581 Change-Id: I7cc050ac65a21bc96e0ffdb8714b2f9a96783b5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions