diff options
| author | Makoto Onuki <omakoto@google.com> | 2020-06-24 23:02:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 23:02:37 +0000 |
| commit | f8b56b9e47a18e10699d5886fa2498d48c7fec2e (patch) | |
| tree | c47ad2932a40b882f55fb876469e580f9b7bf883 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a801498e60f418dc0dcc50e5b27ebdffc208344c (diff) | |
| parent | 5e39e8835afeaa30f3876bdd3b35c5042f651211 (diff) | |
[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations" am: 79c47faf99 am: 2ff58ac90a -s ours am: 5e39e8835a -s ours
am skip reason: Change-Id Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2 with SHA-1 42bec243c0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1349284
Change-Id: I789df5921efec352568b4037c0d3507333e635d8
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions