diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-07-14 06:32:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 06:32:33 +0000 |
| commit | 80a4bfc239ef107187005adf8041650995401dc9 (patch) | |
| tree | 591d972399b57d68428e17091baaff7b88dde3a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 91112eaec9836f1fb736136e2f1f4c9a3b605f24 (diff) | |
| parent | 80ea6c798ddb7d15c63e969993ae4cc8979485fe (diff) | |
am 80ea6c79: am d7be214c: resolved conflicts for merge of 8cee6587 to mnc-dr-dev
* commit '80ea6c798ddb7d15c63e969993ae4cc8979485fe':
Teach storage appops.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions