diff options
| author | Scott Main <smain@google.com> | 2012-03-15 10:25:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-15 10:25:56 -0700 |
| commit | 8fc949ebb1963fa053f7b2b1436989f479c20348 (patch) | |
| tree | 3ad66d15a6e195d22dcaaaf2c321397c2762ed4a /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f197d6a8d2f59a1f7b7e6d84c812bb1706e2fbf9 (diff) | |
| parent | 1fbc85d32ddd8a764d522ba56cae10ca0d6c5f93 (diff) | |
am 1fbc85d3: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit '1fbc85d32ddd8a764d522ba56cae10ca0d6c5f93':
docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions