diff options
author | Robert Ly <robertly@google.com> | 2013-02-05 15:29:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-05 15:29:18 -0800 |
commit | b59967b6556f3ee4071247e22a7f60deb4a2a190 (patch) | |
tree | 5cedb6e9b36eb481089ec34b25f1ea542cfcdafc /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 484f3bdcd663d4ddc9521e788c45338b34a1691d (diff) | |
parent | c92199be8416493739e3fc02666227092a6077a8 (diff) |
am c92199be: am 33fb8f63: am dfa8d028: am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit 'c92199be8416493739e3fc02666227092a6077a8':
docs: update auth doc to mention multiple scopes bug 7644251
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions