diff options
| author | Grace Jia <xiaotonj@google.com> | 2021-03-12 00:05:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 00:05:34 +0000 |
| commit | 3e96c1328c44abd455492b8374c440e9acdc85bf (patch) | |
| tree | 8d2dbc9404df9e4491a8ca22d58e6f9d0d7ee2dc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85bf6255697bd5a9ecb88f650ef9f6737b264363 (diff) | |
| parent | e4bc4e9ca51d6f7c603c2476d8fd4b23ede81d7b (diff) | |
Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 am: e4bc4e9ca5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee57bef7f60bb612b864a72d5bf2d98115b03d28
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions