diff options
author | Scott Main <smain@google.com> | 2012-03-27 10:10:47 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-27 10:10:47 -0700 |
commit | 9792b7025780d008720f06ac58eff0b1976993a3 (patch) | |
tree | a8c5ba70bb8c03774763061f67b34ebce9cb4cd9 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 63a19bdf385417db71c10a5bcc4f687496584df4 (diff) | |
parent | 7822805f5b29efa3ab87af90d0c5b055a7639ab5 (diff) |
am 7822805f: 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 '7822805f5b29efa3ab87af90d0c5b055a7639ab5':
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