diff options
author | Julia Reynolds <juliacr@google.com> | 2014-05-23 13:13:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 13:13:06 +0000 |
commit | 9ad7ed466fa03e0ce46f640ec1174e3d6ff9d057 (patch) | |
tree | b13cc5ad570380ec0d89e1c48a29158076ee463e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f176e3be88ffeaf806acc6e95b131789018bcaf5 (diff) | |
parent | 0e1dc0f5aab427b2ae9d8bbfd3c440490cc7de88 (diff) |
am f98b8c9b: Merge "Create deviceowner gated APIs for creating and removing users in devicepolicymanager." into lmp-preview-dev
* commit 'f98b8c9b8118685120de8e97c13bd15a8f56fc64':
Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions