diff options
author | Craig Mautner <cmautner@google.com> | 2013-10-30 14:12:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-30 14:12:49 -0700 |
commit | c74d0b6cf4a51a24057255452edb2fce4941347c (patch) | |
tree | 3baad4ef18744d976f3e65cb0a2d75b7c4a3affd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 83ed1debd31c46b8a6ff4f63a9754af4cd1b64b5 (diff) | |
parent | 744e0a330937f97a6cc24830e4433cb00b1422d2 (diff) |
am 744e0a33: am 6dc499c6: Merge "Save and restore media metadata." into klp-dev
* commit '744e0a330937f97a6cc24830e4433cb00b1422d2':
Save and restore media metadata.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions