diff options
| author | Trevor Johns <trevorjohns@google.com> | 2010-01-11 14:08:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-11 14:08:15 -0800 |
| commit | 9cebb377c57f3231dbdf278678596871abcef2b8 (patch) | |
| tree | 80897795e03517c0c970320d2d9c99eabd2e21b7 /Android.mk | |
| parent | 44641d3db3b5fd5c7616c8a646ec8b6af20baa18 (diff) | |
| parent | 18dedf2cdfd2c78d93061f20c4269f00449a8e6a (diff) | |
| download | frameworks_base-9cebb377c57f3231dbdf278678596871abcef2b8.zip frameworks_base-9cebb377c57f3231dbdf278678596871abcef2b8.tar.gz frameworks_base-9cebb377c57f3231dbdf278678596871abcef2b8.tar.bz2 | |
am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'
* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -364,6 +364,8 @@ web_docs_sample_code_flags := \ resources/samples/ApiDemos "API Demos" \ -samplecode $(sample_dir)/BluetoothChat \ resources/samples/BluetoothChat "Bluetooth Chat" \ + -samplecode $(sample_dir)/BusinessCard \ + resources/samples/BusinessCard "Business Card" \ -samplecode $(sample_dir)/ContactManager \ resources/samples/ContactManager "Contact Manager" \ -samplecode $(sample_dir)/Home \ |