diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-11-10 15:52:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 15:52:43 +0000 |
| commit | 6db940088404f1b210c2e091476a74bf846f2d5e (patch) | |
| tree | 3d5927578ada507a38c8d9a13e7a57e89483a1b9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 92de9c1d7e976985e92b7f9c2c7e47fa4ac80d97 (diff) | |
| parent | 4974fae3bae6eb08a3f735603a4eae1780be6c94 (diff) | |
am 4974fae3: am 5a8f191c: am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev
* commit '4974fae3bae6eb08a3f735603a4eae1780be6c94':
Adjust owner info to spec
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions