diff options
| author | 2022-10-19 11:20:52 +0000 | |
|---|---|---|
| committer | 2022-10-19 11:20:52 +0000 | |
| commit | cf00b5bfff544ab8afbd406f20e140ae63c3bb4d (patch) | |
| tree | c7950e3b108db8c8b3d64e5cf0d00ae2d4ec34d7 /libs/androidfw/ResourceTimer.cpp | |
| parent | b39c5a816c1ad1ec932948986bd694a639dab25a (diff) | |
| parent | ca79065217c603264f6082f421152f7a674c5754 (diff) | |
Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes" am: 258d8f6321 am: 8640d2a406 am: ca79065217
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260581
Change-Id: I3c74008efa832fd9df5954b93c08a764ac59fe63
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