diff options
| author | Eric Laurent <elaurent@google.com> | 2015-07-08 18:20:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 18:20:33 +0000 |
| commit | 0cd064335c8daec8c8a4d9fbf0ca246e5e6a3b90 (patch) | |
| tree | 891d7606989d4782404f016d1d0b0cb8bd0df2f9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e3c8ed42f4673370027ec90299f1df74ffd08ab1 (diff) | |
| parent | 373a0b5c602c5826cc0ab6642446981ccb52883c (diff) | |
am 373a0b5c: am dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit '373a0b5c602c5826cc0ab6642446981ccb52883c':
audio: add definitions for devices connected over IP
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions