diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-28 23:31:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 23:31:44 +0000 |
| commit | 0399c4944f06e2fbe1e360c683430cdc55193b89 (patch) | |
| tree | ceb84bf55d81702977b384dfc792745f1a23906a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 284b71639fb92431760a4ab283985a2d0e0d5118 (diff) | |
| parent | faf48c00ae72292265cbd2d372e4dc612aec26c7 (diff) | |
[automerger skipped] Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a am: 1819888bfb am: faf48c00ae -s ours
am skip reason: Merged-In I942d4c0c7c786d7c8b561e5e65773367cefffb31 with SHA-1 5bf8a8436f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683909
Change-Id: Iee54e3eeafc0c15af6dfda4c6ad37addd850b813
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions