diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-01-07 10:17:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 10:17:13 +0000 |
| commit | b1c7f0215bc36b5f27d226d1fc085be99201fe7b (patch) | |
| tree | 4d1a1c02345be02d7898c106eeebc10d0eb2c957 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b68c58483affc8a6a9d6e011dc48f2494a5999b0 (diff) | |
| parent | 909f840cdaf4f172b29c2c56921c4619165c4820 (diff) | |
am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
* commit '909f840cdaf4f172b29c2c56921c4619165c4820':
docs: Checklist for TV Apps
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions