diff options
| author | Jason Chen <jasonchen@google.com> | 2010-11-04 09:29:55 -0700 |
|---|---|---|
| committer | Jason Chen <jasonchen@google.com> | 2010-11-04 09:29:55 -0700 |
| commit | 15d18efddd047406b62d5482356342fccd0f68dc (patch) | |
| tree | 4c110dd108fc151485cb5c8a38dadb3b73f270c8 /Android.mk | |
| parent | ce4b523eb81a07b985ac08973e43d0c7629ff36d (diff) | |
| parent | f0452c250757f560205da19b02a9172e5d98a71c (diff) | |
| download | frameworks_base-15d18efddd047406b62d5482356342fccd0f68dc.zip frameworks_base-15d18efddd047406b62d5482356342fccd0f68dc.tar.gz frameworks_base-15d18efddd047406b62d5482356342fccd0f68dc.tar.bz2 | |
resolved conflicts for merge of f0452c25 to master
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -419,6 +419,8 @@ web_docs_sample_code_flags := \ resources/samples/SampleSyncAdapter "Sample Sync Adapter" \ -samplecode $(sample_dir)/SearchableDictionary \ resources/samples/SearchableDictionary "Searchable Dictionary v2" \ + -samplecode $(sample_dir)/SipDemo \ + resources/samples/SipDemo "SIP Demo" \ -samplecode $(sample_dir)/Snake \ resources/samples/Snake "Snake" \ -samplecode $(sample_dir)/SoftKeyboard \ |