diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-08-17 16:24:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-17 16:24:22 +0000 |
| commit | c11dd7be7514f61f80d88447c29ea663094d1fa0 (patch) | |
| tree | a40c81ee3a74a9fe3fdc98b4738f0ec873e83127 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b6434fe64b6c0d329159682ea96838dedce7d6e8 (diff) | |
| parent | 1b188923d4ede989b89f71a75c831f2369895e0b (diff) | |
am 1b188923: am 6f412906: am f9ed55be: am 3c315c90: am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev
* commit '1b188923d4ede989b89f71a75c831f2369895e0b':
Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions