| commit | 69c3a5cddf4e675ced029af9d1620e6456f118d7 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Jul 15 11:23:08 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 15 11:23:08 2010 -0700 |
| tree | acf31b604a25277ce998fffab2b93b1bdf68cea4 | |
| parent | f0ff0aa6b727f27c381666b14036499882cd4405 [diff] | |
| parent | 5e22cd72190afab0328297cad2bcd604e30c823f [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