diff options
| author | Michael Wright <michaelwr@google.com> | 2013-05-24 13:56:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-24 13:56:09 -0700 |
| commit | 9d6ee7ec3d4a7db89f6b4878bc3da673c06c96ad (patch) | |
| tree | c683c1f6d3ac5c0a2e03f96004eb999d8197d2e6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3d05476b1049bc35727a5432de7af99dd8e0a8c2 (diff) | |
| parent | 4759c35e423a949699d7b3438e0239e33452af7a (diff) | |
am 4759c35e: (-s ours) am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev
* commit '4759c35e423a949699d7b3438e0239e33452af7a':
Pipe through bounding box information (DO NOT MERGE)
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions