diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-04-03 08:31:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 08:31:19 +0000 |
| commit | 36ba373e09d7cebef8b58c9e985314ebe847aa35 (patch) | |
| tree | cdf34c39f9b4834b40df14e2c49d2a9df5e9a652 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aa11084c3ba1bf166febce53ccb9852f72f2a4a5 (diff) | |
| parent | 4f342e878d88b1f75a9b487e2aa0582b59e29083 (diff) | |
am 4f342e87: (-s ours) am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
* commit '4f342e878d88b1f75a9b487e2aa0582b59e29083':
Add signature|system permission to MediaDrm signer APIs
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions