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