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