| commit | 5e22cd72190afab0328297cad2bcd604e30c823f | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Jul 15 11:20:32 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 15 11:20:32 2010 -0700 |
| tree | 6498bb2b0c2c46e921a2c5ba3f85549ca23d3d85 | |
| parent | 13bea643934b65efed4d301d1e580534431b475d [diff] | |
| parent | a4e25ab1f31bdd9d433576e927dafd7b972271cc [diff] |
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 '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread * commit '38137d7a27b037611c70a9d900aa53b4c15563bf': docs: lots of additions to the resources docs