diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-21 18:10:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-21 18:10:40 +0000 |
| commit | ef35e18c2f781f3f4e56d6ca6d2151251bf03e71 (patch) | |
| tree | 694bda540111ea58c997e510d31dc29544587216 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a28729b6293012f5ab5b66364ef8cf6dc7d9874c (diff) | |
| parent | 4f8a8f68fd4900cfbeb3cce5b87140a27f8c316e (diff) | |
[automerger skipped] Merge "Media - Leave playing media in QS" into rvc-qpr-dev am: 0766cdc08c am: 4f8a8f68fd -s ours
am skip reason: Change-Id Ia7c9a8d9b100506f2c12ef2d14e4a952e151bd05 with SHA-1 11a332b7c4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12548203
Change-Id: Ia937b417eb2d91b547e527228aaa0f9fb0dbc546
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions