diff options
| author | Lajos Molnar <lajos@google.com> | 2015-08-03 18:25:18 +0000 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 18:25:18 +0000 | 
| commit | 2f501cc00a09d328e39e4c02aa72b894624acf54 (patch) | |
| tree | 0ea89ad13dca66afb3d2fc432a8420b263228cd1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 91ddd4ad1368db5fb304f4640c7fb1e2678fbb6b (diff) | |
| parent | 0ca1e98fdf300ddbbccbfce26bba5947109597f1 (diff) | |
am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '0ca1e98fdf300ddbbccbfce26bba5947109597f1':
  media: Clarify MediaCodec and CodecCapabilities documentation
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
