diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-24 23:59:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-24 23:59:05 +0000 |
| commit | 02e857441fcc27134f335aee659d553641a2b2ab (patch) | |
| tree | 725b81f1c49f32daf3f09e421a09073cf075fda2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9a4db3114b1f3c5c682ee4c9c6f78651c5fc38b8 (diff) | |
| parent | 5f5ca3bc98fb773ee905289300595ad95d5ffabe (diff) | |
am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
Use the suggested public API instead of libcore.os.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions