diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-06-05 17:09:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-05 17:09:20 +0000 |
| commit | d4357ffd92a1b8de5e8cdfa2d8665214a0419c98 (patch) | |
| tree | ff71b96e5b45fc05bb242aace0052868f0c92444 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 23cfb64c6aca636b09651409062cc14a97a88984 (diff) | |
| parent | eb974d5ac4b8733e4788066ec9ac6cf2bfb75c9b (diff) | |
am eb974d5a: Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev
* commit 'eb974d5ac4b8733e4788066ec9ac6cf2bfb75c9b':
More inclusive rules for using outsets.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions