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