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