diff options
author | Scott Main <smain@google.com> | 2011-12-15 15:58:33 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-15 15:58:33 -0800 |
commit | 608461ffd5f3146c39a69496d275d7dabf1e2f90 (patch) | |
tree | 2389373b1e89c57bc08171d38bf29cb162bf93de /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a739235aed598fbd40c63d5e01e8bf55836b0de0 (diff) | |
parent | 19552e95db26d96977daa42cda4de8e58c6feb0a (diff) |
am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '19552e95db26d96977daa42cda4de8e58c6feb0a':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions