diff options
| author | Roman Nurik <romannurik@google.com> | 2009-12-10 19:48:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 19:48:47 -0800 |
| commit | 05bbeb356286bfb6ddc26ac546cce03334e346dd (patch) | |
| tree | 467fac43439cb51a094df2ebcac20a6b53d99752 /Android.mk | |
| parent | 024726391ad1536c5fa4af3f786141e200efed54 (diff) | |
| parent | 7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1 (diff) | |
| download | frameworks_base-05bbeb356286bfb6ddc26ac546cce03334e346dd.zip frameworks_base-05bbeb356286bfb6ddc26ac546cce03334e346dd.tar.gz frameworks_base-05bbeb356286bfb6ddc26ac546cce03334e346dd.tar.bz2 | |
am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-mr2
* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -361,14 +361,18 @@ web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/ApiDemos \ guide/samples/ApiDemos "API Demos" \ - -samplecode $(sample_dir)/BluetoothChat \ - guide/samples/BluetoothChat "Bluetooth Chat" \ + -samplecode $(sample_dir)/BluetoothChat \ + guide/samples/BluetoothChat "Bluetooth Chat" \ + -samplecode $(sample_dir)/ContactManager \ + guide/samples/ContactManager "Contact Manager" \ -samplecode $(sample_dir)/Home \ guide/samples/Home "Home" \ -samplecode $(sample_dir)/JetBoy \ guide/samples/JetBoy "JetBoy" \ -samplecode $(sample_dir)/LunarLander \ guide/samples/LunarLander "Lunar Lander" \ + -samplecode $(sample_dir)/MultiResolution \ + guide/samples/MultiResolution "Multiple Resolutions" \ -samplecode $(sample_dir)/NotePad \ guide/samples/NotePad "Note Pad" \ -samplecode $(sample_dir)/SearchableDictionary \ @@ -376,7 +380,13 @@ web_docs_sample_code_flags := \ -samplecode $(sample_dir)/Snake \ guide/samples/Snake "Snake" \ -samplecode $(sample_dir)/SoftKeyboard \ - guide/samples/SoftKeyboard "Soft Keyboard" + guide/samples/SoftKeyboard "Soft Keyboard" \ + -samplecode $(sample_dir)/Wiktionary \ + guide/samples/Wiktionary "Wiktionary" \ + -samplecode $(sample_dir)/WiktionarySimple \ + guide/samples/WiktionarySimple "Wiktionary (Simplified)" + + ## SDK version identifiers used in the published docs # major[.minor] version for current SDK. (full releases only) |