diff options
| author | Rubin Xu <rubinxu@google.com> | 2014-11-19 00:09:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 00:09:43 +0000 |
| commit | 40603baa3ec570b1cb423e3488125b1dd35cb5e9 (patch) | |
| tree | dc0f61dc86e674d8321134fb3cfb0221134d6d09 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0122db0a6397f5bd08042e1a5919114e3cccb9f4 (diff) | |
| parent | 735f22850edcb5c2447c37cb96f048de8a742907 (diff) | |
am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
Remove permission check in DevicePolicyManager.isUninstallBlocked()
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions