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