| commit | 164fa377d1ee46e8d08c4baf92c46a2a8b01bf5b | [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 | 802acc42d7113d4fd8add6700393058549213505 | |
| parent | 015fdae70f0ac3efbb28d942e3a0b1f4ab53a112 [diff] | |
| parent | 69c3a5cddf4e675ced029af9d1620e6456f118d7 [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