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