diff options
| author | Anton Hansson <hansson@google.com> | 2020-09-02 16:36:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 16:36:08 +0000 |
| commit | ace83ac2416bdc90f3259565629f77eeea9be4b1 (patch) | |
| tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8d0165a311a4c6a955aea8ddf57efced947ff9d8 (diff) | |
| parent | 54a9b57203dcfda6bc5ed02a6f91a1ec44a03b79 (diff) | |
[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -s ours am: 4a1dceff0a -s ours am: 54a9b57203 -s ours
am skip reason: Change-Id I4fc66d607276ff885947489afd63e1370ec85939 with SHA-1 01ff6b243f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418009
Change-Id: I7243638eb8dcb3c7176841c14cd2bc2f506396cc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions