diff options
| author | Scott Main <smain@google.com> | 2010-07-15 11:20:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:20:32 -0700 |
| commit | 5352d2378d2f92ebe0657e4caedb4498492fc404 (patch) | |
| tree | 60073a489242a14269654f6ac8cb06b82f24bc86 /docs/html/images | |
| parent | d6a85a21418338a7797bff731fa7a551f62a9e86 (diff) | |
| parent | 38137d7a27b037611c70a9d900aa53b4c15563bf (diff) | |
| download | frameworks_base-5352d2378d2f92ebe0657e4caedb4498492fc404.zip frameworks_base-5352d2378d2f92ebe0657e4caedb4498492fc404.tar.gz frameworks_base-5352d2378d2f92ebe0657e4caedb4498492fc404.tar.bz2 | |
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
Diffstat (limited to 'docs/html/images')
| -rw-r--r-- | docs/html/images/resources/clip.png | bin | 0 -> 2464 bytes |
| -rw-r--r-- | docs/html/images/resources/layers.png | bin | 0 -> 8248 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/images/resources/clip.png b/docs/html/images/resources/clip.png Binary files differnew file mode 100644 index 0000000..9196b3f --- /dev/null +++ b/docs/html/images/resources/clip.png diff --git a/docs/html/images/resources/layers.png b/docs/html/images/resources/layers.png Binary files differnew file mode 100644 index 0000000..f7e6929 --- /dev/null +++ b/docs/html/images/resources/layers.png |
