diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-31 17:12:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-31 17:12:38 +0000 |
| commit | 8396b56e0a12d97c7933afca3813c356c18a8f38 (patch) | |
| tree | 9aea6d2f9fe52e692323f09f717688799e990a28 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fd6a44d0b5b6bcfc606abf23520b316c4bf36fc4 (diff) | |
| parent | d49babe50d61e0264a9f4fbf0b4e182cc56635db (diff) | |
am d49babe5: (-s ours) am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit 'd49babe50d61e0264a9f4fbf0b4e182cc56635db':
Change ResourceType cookies to int32_t.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions