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