diff options
| author | Scott Main <smain@google.com> | 2013-04-25 21:22:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-25 21:22:38 -0700 |
| commit | 01e48e7d1541920ece358257e4c2481936497835 (patch) | |
| tree | 53e815cb662f8e1d3376159a5698955881c132b2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 57fc8122eabc08b19a41f308d409795d094856d8 (diff) | |
| parent | 22f6a60e62253436a4f7da1a5d59adc0f17534cc (diff) | |
am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev
* commit '22f6a60e62253436a4f7da1a5d59adc0f17534cc':
add docs for new attributes, including account restriction for restricted profiles
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions