| commit | 82e2b4cb51e869a5c2014f56e5b0cf38569ff09a | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Jul 15 11:54:15 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 15 11:54:15 2010 -0700 |
| tree | ded73881ae106cc8539fe0729889884738ed3127 | |
| parent | 892681e56ee6da6e8d4fb9ec41e75e814ae9e099 [diff] | |
| parent | 4fd416880e53c172bac4a51b2eafea699b58badf [diff] |
am 4fd41688: 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 '4fd416880e53c172bac4a51b2eafea699b58badf' * commit '4fd416880e53c172bac4a51b2eafea699b58badf': docs: lots of additions to the resources docs