diff options
| author | Scott Main <smain@google.com> | 2012-03-26 16:47:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-26 16:47:30 -0700 |
| commit | 7822805f5b29efa3ab87af90d0c5b055a7639ab5 (patch) | |
| tree | 83c98966e4d50582936f8f80fc29cde74b9e10da /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6b59266b0bf861f42b181b602115b8a8833c7212 (diff) | |
| parent | 72d125eb872f2185dd36ef34d04555dff5eb20f3 (diff) | |
am 72d125eb: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
* commit '72d125eb872f2185dd36ef34d04555dff5eb20f3':
docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions