diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-08-17 00:19:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-17 00:19:24 +0000 |
| commit | 1b188923d4ede989b89f71a75c831f2369895e0b (patch) | |
| tree | 0c4f13eef0ea8b8431b0324c5a52c0c82560fc79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c3c5bfe1adc1dd5ee844c39b35584dccc3650247 (diff) | |
| parent | 6f412906a4712911936c41018651f7d6bf7b576c (diff) | |
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 '6f412906a4712911936c41018651f7d6bf7b576c':
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