diff options
| author | Scott Main <smain@google.com> | 2013-04-25 21:27:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-25 21:27:06 -0700 |
| commit | 3fc184cf6e6f3e1d3e3360be11c76e0d081afaa1 (patch) | |
| tree | dab8047d0b3c7f10fc686a1711bd67b0a9c87179 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 80246dbdb5d00b4509152d2d0837839f473a44f0 (diff) | |
| parent | 01e48e7d1541920ece358257e4c2481936497835 (diff) | |
am 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev
* commit '01e48e7d1541920ece358257e4c2481936497835':
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