diff options
| author | Grace Jia <xiaotonj@google.com> | 2020-08-13 19:06:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-13 19:06:43 +0000 |
| commit | 300b3cce7222cdd10517a925cb25bc722a019db2 (patch) | |
| tree | 1c8a51769f66a66ff0b7275590b5628c8f24339d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 86050129a0e5515de2a1341df94bb2ef120c5026 (diff) | |
| parent | 6a55cd1644f2095c9cb5a533a1e4464bf0edae71 (diff) | |
Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908
Change-Id: Ifc88640d6fb38e14a58ad802f520b0c0ee0b35b8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions