diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-02 07:12:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-02 07:12:08 +0000 |
commit | f7a1010832d4cf87884bd6284a7f01592672cb91 (patch) | |
tree | d9988055d02ecbce38853a502f6acd3a73abea20 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d89cce39d1fc0639894fab9e22527a3ddbd3d658 (diff) | |
parent | 9906d7d9d0ef14ea4e146fa0bae98bf56b4b2882 (diff) |
Merge "Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 am: 458d37d5bb am: d384468742" into rvc-qpr-dev-plus-aosp am: 9906d7d9d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12042284
Change-Id: I0eb956cd05a37f53558f34f639e707312b5b266b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions