diff options
| author | Anton Hansson <hansson@google.com> | 2020-09-02 17:48:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 17:48:38 +0000 |
| commit | 4a8a1ab4b4fb3c9abdbc85b44a738e356ff01a9b (patch) | |
| tree | 7cd49368d5c807f0230d697672a27df038af1f0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 59526a10742f3dcd0f0c0ddb99be9490f5a14058 (diff) | |
| parent | ace83ac2416bdc90f3259565629f77eeea9be4b1 (diff) | |
[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -s ours am: 4a1dceff0a -s ours am: 54a9b57203 -s ours am: ace83ac241 -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: I36337a8b76a14628c7babdf869ecf0140c3d30e3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions