diff options
| author | Jack Yu <jackcwyu@google.com> | 2021-02-03 04:31:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-03 04:31:10 +0000 |
| commit | 3b35ad2fdac386c581e4ef6d990d376ea395f23d (patch) | |
| tree | faadf6b8573618828b6c1ffb06802734f1f9d602 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d647902ca6620e92ea2ac6bd057adeec60bd8094 (diff) | |
| parent | 73b63e3819d1feff7e29ce827edd6c508b223e41 (diff) | |
[automerger skipped] Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 am: 87e9535aa3 am: 73b63e3819 -s ours
am skip reason: Change-Id I03bd537082117e595a7badfb2d8ca6ee7cae08cf with SHA-1 ad9223f687 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470724
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd37207790f6ab84ca0e089c7fb7a17765667607
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions