diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-10 18:33:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-10 18:33:25 +0000 |
| commit | 7a2ca6fbecc495b2aa3b94577106b90acdabc78c (patch) | |
| tree | 9384a97677388d8faf03b2d4e393e2d154cae51b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 24f2922cfea3a73f34582fc4dd60bf277e2ccacd (diff) | |
| parent | 46c190f2ebb82b3a17d704492032ad0042edd6c0 (diff) | |
[automerger skipped] Merge "Add guts to media player on long press" into rvc-qpr-dev am: 994c26d04f am: 46c190f2eb -s ours
am skip reason: Change-Id I340e0b37393573f81a3bf12d5e453eccf5982473 with SHA-1 429360fb39 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345484
Change-Id: I7d11e5915922f200e6e96bf0ef03abab303604b2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions