diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-08-29 10:49:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-29 10:49:20 -0700 |
| commit | c5f34bd40bc68925c6e99da02e179227d8eb3ae4 (patch) | |
| tree | b2d9e04a40465002bcdccad39fc0a83f95c6c3c7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 393e3170b3f52a3e191554ffd8c8f81821ba2074 (diff) | |
| parent | 48c45d0e3bcacebfc3635bc893875146b7ecb787 (diff) | |
am 48c45d0e: Merge "Fix join scenario with provision discovery"
* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
Fix join scenario with provision discovery
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions