diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-08-05 11:24:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-05 11:24:18 +0000 |
| commit | 952977322215b990f5aa6898bfaa40bb064545f4 (patch) | |
| tree | 3dbb50972a58839d556a1a39022c2170e8e13632 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 37b1843417b1362530b51b1d5c5f8bda06a7c92e (diff) | |
| parent | 86e7d135acbdb0055de6a687817d44ac60603c9f (diff) | |
am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
* commit '86e7d135acbdb0055de6a687817d44ac60603c9f':
Fix NOT_RESTRICTED network capability and enforce it.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions