diff options
| author | Scott Main <smain@google.com> | 2010-07-15 11:23:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:23:08 -0700 |
| commit | 4fd416880e53c172bac4a51b2eafea699b58badf (patch) | |
| tree | 65ba0abf51ee25e98fed39e60beeb9936a44f7eb /graphics/java/android/renderscript/ProgramRaster.java | |
| parent | b068b47c6d0214256116a0c661740bddf7acc18c (diff) | |
| parent | 5352d2378d2f92ebe0657e4caedb4498492fc404 (diff) | |
am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp
* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
docs: lots of additions to the resources docs
Diffstat (limited to 'graphics/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions