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