diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2019-04-15 11:55:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-15 11:55:42 -0700 |
| commit | 1e577c1ce5edd67877e17f97673b8ecb6c482109 (patch) | |
| tree | cefdd23e8ad1b92daae797aa5451f81572c183c7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | da439d4abbc0a2ebae58c40771bf88f42937da7e (diff) | |
| parent | f98ada2290e769cb99c9e6f03144ffd4de8b1742 (diff) | |
[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev
am: f98ada2290 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history
Change-Id: I40000c30cca0a169eb22fbd74ca3cff1f546bd05
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions