diff options
| author | Mark Renouf <mrenouf@google.com> | 2014-11-04 07:22:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 07:22:48 +0000 |
| commit | c2a667cc4e0607bc33248299bde6f9821de25ac1 (patch) | |
| tree | 52c6a81e77c1024f8fc791cd904be30fa898b0bb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5070b63f40a0296a6938524f5201842c37c6f685 (diff) | |
| parent | 2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae (diff) | |
am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours
* commit '2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae':
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions