diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-07-31 17:11:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 17:11:07 +0000 |
| commit | 4cfe2a8c0050a69e1793f41a60395b69277973b2 (patch) | |
| tree | b0d2e94eb5eb9c5ffb2542f9a3b9855011e0e804 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8ceb1188f17826088695ed488ad0ab58ec22afa2 (diff) | |
| parent | f26ec92d9632868d37ea7aca9ad4a2474ae0a052 (diff) | |
am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev
* commit 'f26ec92d9632868d37ea7aca9ad4a2474ae0a052':
Add telecom extra keys required for DMR release.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions