diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-10-03 19:18:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-03 19:18:05 +0000 |
| commit | 86fe8ba1a4e412a2863ef691372834135b072b20 (patch) | |
| tree | 020a5509aa0816ef10d8a08bb140aaf81e5ff2db /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 79625e978cf2dc7a90f5d3503066f35816070609 (diff) | |
| parent | 61d67acde5e4da465915a278e8d9357bd9e16c52 (diff) | |
Merge changes from topic "am-85dda005ca6342199835b5ce487e1702" into pi-dev-plus-aosp
* changes:
Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" am: fce8595437 am: 6ac6aead0d
Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" am: fce8595437
Add SapProfile to LocalBluetoothProfileManager (1/2) am: 2be42b972c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions