diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-02 23:07:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 23:07:43 +0000 |
| commit | 9438ad1599716176fb6c593e77a2e93b265bbcb5 (patch) | |
| tree | b8d7eef8c9baf5837a896a0e2ccbdd7f1d930a29 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 723bce8a0d4fa900ca4344c03e5e82b5881fcf19 (diff) | |
| parent | e580d6617f67a1db5eff7ffe5450684cfc7e1a2b (diff) | |
am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
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