diff options
| author | Phil Burk <philburk@google.com> | 2015-10-12 22:04:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-12 22:04:43 +0000 |
| commit | 1b3eb741b5a3f3baea4b6b101ed4e39c15845f13 (patch) | |
| tree | 5df2b0c3060bcf200b7ba8b09160ed4fbe418143 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0a64b146d0bb65145a9644a8e2ad59e80fe37678 (diff) | |
| parent | ca296978e7f2a1f70b8dca32b1db9372c2392458 (diff) | |
am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
* commit 'ca296978e7f2a1f70b8dca32b1db9372c2392458':
MidiManager: fix double BTLE callback
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions