diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-01 14:50:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 14:50:57 +0000 |
| commit | c98ca4c32641961de3391075b085e8bb953f43ea (patch) | |
| tree | 47a954dfa8f3f76fb0f01ec0ddd9d04f82e678ff /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71b3467a8acb0c5ffb7d63fcf3096988495bd6fe (diff) | |
| parent | fbd80b58db2aa8f650acf26305e8cbed24a5755b (diff) | |
am fbd80b58: (-s ours) am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit 'fbd80b58db2aa8f650acf26305e8cbed24a5755b':
Adjust instruction sets for shared UID apps.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions