diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-01-07 09:49:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 09:49:51 +0000 |
commit | 7a26ec197642ea02641a2483ef15ef52b7bbb527 (patch) | |
tree | f7d52448ce41504af79c6c66153d99dd989ca716 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0d28453111ea33cd56653d6a8a2145907d6ffe39 (diff) | |
parent | 6feb97a95bb94d4e5f0bc879f2ce85409cfa6bed (diff) |
Merge changes from topic "connectivity_jar_in_apex" am: 60dfb880de am: 6feb97a95b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id85d632781cd8eb0850e919cd6bf990fca17f414
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions