diff options
| author | Santiago Seifert <aquilescanta@google.com> | 2020-11-06 11:33:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 11:33:39 +0000 |
| commit | da674f574179925fec2734c4f33385174b87928e (patch) | |
| tree | a7954e753f7d5574fb40a3fd145d34ad8d4d9297 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85b41414abedcddf94fb0afa3a57f83bbecd2a33 (diff) | |
| parent | 101ddd7bdbf7c7fff587f46a9aa74e271d1f8bf7 (diff) | |
[automerger skipped] Merge "Add MediaMetrics support to MediaParser" into rvc-qpr-dev am: 6bd7effa4c -s ours am: 101ddd7bdb -s ours
am skip reason: Change-Id If51ee018da3056231910cd9c18f1b938a5c0e343 with SHA-1 9ca23a4863 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086606
Change-Id: I3c9a9a27e5947096139d48c951f0669984674ddd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions