diff options
| author | Scott Main <smain@google.com> | 2013-07-19 14:22:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 14:22:12 -0700 |
| commit | 612e67eb44f55d77b14547126f665a031a01d4b8 (patch) | |
| tree | 51c8542f0fdf6be969d91a449b03d96bb7b886ee /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f5218a8fffcb3650ad3580142d1d3990a916f21c (diff) | |
| parent | a12d5e0dcab49fb02cac3e7982f1ad0ecf170a40 (diff) | |
am a12d5e0d: am 52a74a21: am 1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev
* commit 'a12d5e0dcab49fb02cac3e7982f1ad0ecf170a40':
more details about account access in restricted profiles
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions