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