| commit | 5352d2378d2f92ebe0657e4caedb4498492fc404 | [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 | 60073a489242a14269654f6ac8cb06b82f24bc86 | |
| parent | d6a85a21418338a7797bff731fa7a551f62a9e86 [diff] | |
| parent | 38137d7a27b037611c70a9d900aa53b4c15563bf [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