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