diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-24 20:06:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 20:06:31 +0000 |
| commit | 7385aca1a2bcb702cbf49b4cd3d1cf60972f9407 (patch) | |
| tree | dc1e8694109371fd98b668d7348504a60e79e111 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 21b0b3ac436262a01d7e7c42fb48a758a2a0bbe8 (diff) | |
| parent | f0bead280154fd9a5d2c07b1186e10fcfeed55fc (diff) | |
am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
* commit 'f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
DO NOT MERGE Enhance local log.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions