diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-29 22:21:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 22:21:13 +0000 |
| commit | 4799a9e06e2491aeedde7db46d62abfb7aa1d594 (patch) | |
| tree | 8f8eb69135d12d01883b454eca0c6c082ac92a51 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 92cb006c374aa4d6159ebba39cbb9ee9eb8b9d70 (diff) | |
| parent | f8808db0c107c748ba84b097c97de13ec33fd8fa (diff) | |
am f8808db0: am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
* commit 'f8808db0c107c748ba84b097c97de13ec33fd8fa':
Revert "DO NOT MERGE Enhance local log."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions