diff options
| author | Lajos Molnar <lajos@google.com> | 2015-08-03 19:09:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 19:09:47 +0000 |
| commit | 221716ea11e1183705001957a00da65670574a0b (patch) | |
| tree | 7da816ab110294977f46bb2bffbdde8c3e82f039 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 22350a8c2ce619ea799bba67d1fbced03ef44355 (diff) | |
| parent | 57f2d561d407d9d1846fc1247bedcda1dde28a00 (diff) | |
am 57f2d561: am 1e891397: am 02159cf3: am 2f501cc0: am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '57f2d561d407d9d1846fc1247bedcda1dde28a00':
media: Clarify MediaCodec and CodecCapabilities documentation
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions