diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-09-02 00:06:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-02 00:06:32 +0000 |
| commit | cb41a60ee259ee332eb11e2208c3ae5582ec5aec (patch) | |
| tree | 2f419ec354f6bcd765620f4fb91dd15939e877a2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 260ae8e56c6c3f6acd9290a843f6cfe27cdad6a7 (diff) | |
| parent | 7f2b4b6a63a6d2d6f7cbd6be9cc86d826fa99107 (diff) | |
am 7f2b4b6a: am 7e28b3bc: am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev
* commit '7f2b4b6a63a6d2d6f7cbd6be9cc86d826fa99107':
DO NOT MERGE: Fix DngCreator default crop calculations.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions