diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-07-31 00:13:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 00:13:55 +0000 |
| commit | 57a992021b2279f34265eb403816417a1ce682f2 (patch) | |
| tree | b8c7dab2fa2588c55930094099c0e63e60bf4cc1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c8c3539de720449d60b754aabc19bf2693eaa09b (diff) | |
| parent | d247d8b4aa6eff39fad55c04e47d0d92d9c69751 (diff) | |
am d247d8b4: am 135e2ce5: am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit 'd247d8b4aa6eff39fad55c04e47d0d92d9c69751':
Add OrSelf to privileged permission check.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions