diff options
| author | Louis Chang <louischang@google.com> | 2021-01-22 02:32:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-22 02:32:28 +0000 |
| commit | f0412190ca43c70e694f054de1c1719647a71488 (patch) | |
| tree | 84d1468e625e6dbccfc5682e8a0013baf6d3f38f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d19d9a120bb7dd840279766a10f6e3f667ff7726 (diff) | |
| parent | 7896757e9b931d5624d4838f67dfa8cfcd2f831a (diff) | |
[automerger skipped] Merge "Do not attach the added recent task to TDA" am: 6004efd8ee am: a10f155b20 am: 7896757e9b -s ours
am skip reason: Change-Id Ibe09d7f0381705defe2fc82bf11339da2aaa6294 with SHA-1 e2871a4266 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554021
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4a36f0ac0e2e18bc30a406659c27e43178a37ea
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions