diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-05-29 15:18:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-29 15:18:45 -0700 |
| commit | 2bf15756cc416644a4777d76a94947bee75d8b3b (patch) | |
| tree | 2945ad880ee8377fcd1b0fb018f15c13f56157d3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 26e20713f17fa165c3f78277babeffeaeda5e652 (diff) | |
| parent | 91ea7882cdba6bef7918fcd4ff645a9693fdc861 (diff) | |
am 91ea7882: am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '91ea7882cdba6bef7918fcd4ff645a9693fdc861':
Doc change: adjust description of NEW_OUTGOING_CALL.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions