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