diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-03 00:30:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:30:56 +0000 |
| commit | 625fa573b4cea5c5ee86f79ef76f16545935507e (patch) | |
| tree | f046cd0b33cd4ccbf4588680f17cfd687427693a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 83cb9cad31ec57923497d218d6febf6f17be70dd (diff) | |
| parent | 9438ad1599716176fb6c593e77a2e93b265bbcb5 (diff) | |
am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions