diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:17:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 18:17:13 +0000 |
| commit | f788158e2a1c240eae9e8cc8d78823773b8b7da4 (patch) | |
| tree | 197d973cbabf56ee181d0916e5fcbf0005a25c3d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c0e899ab04b17bc946192a1abf961c989a283f5 (diff) | |
| parent | c76702088b13d6c2edbb3f5a2a07efad38bf660b (diff) | |
Merge changes from topic "am-edb851dd6c374b38b96c0573a28a3186" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes from topic "am-8aa3e7d6bc464a7ca8763f06d92f1c24" into rvc-d1-dev-plus-aosp am: fd3cd181fd
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f am: 53f1a99fa0 am: 18b5a53447 -s ours am: 0b212d65e1 -s ours am: a9f6ccf964 am: dae7a3468c -s ours am: 6a2eb025f4 am: 1daf6dd2ed am: d3110f412e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions