diff options
| author | Kenny Root <kroot@google.com> | 2014-04-19 00:02:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-19 00:02:04 +0000 |
| commit | 54e236f9b8d6ee8459c98497d81a4feb48f0e82d (patch) | |
| tree | 676e4144ff27016790036e5246764fc560477c71 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 36e64ab902a6932f2711d1dff6ee273610d68e7d (diff) | |
| parent | 0090082ed040dd3ea897cf13d7e837dadd06ca3f (diff) | |
am 0090082e: resolved conflicts for merge of 89a086c1 to klp-modular-dev
* commit '0090082ed040dd3ea897cf13d7e837dadd06ca3f':
Use hidden API to validate APK chains
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions