diff options
author | Craig Mautner <cmautner@google.com> | 2014-03-14 23:57:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 23:57:24 +0000 |
commit | 821df858fcc63be8cd7e53e6432a6a17d734412d (patch) | |
tree | e5f485fac157bd3e47ca8f289a75f7c4150cb995 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c2b8df82d701eb3508da06f75b2201c3f9796373 (diff) | |
parent | 5b98618f2471cbea8466ec5a4dea0a819a7c0f3c (diff) |
am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge
* commit '5b98618f2471cbea8466ec5a4dea0a819a7c0f3c':
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions