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