diff options
| author | Jeff Hamilton <jham@android.com> | 2010-05-27 23:13:40 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2010-05-27 23:13:40 -0500 |
| commit | 2cfbcb88ed85ac0a0bc93f558d5d7928be762102 (patch) | |
| tree | 59393f1f78ddc1cd63d1f2d7aedabbd54cbb18de /Android.mk | |
| parent | 6ff43a7545880f0b1c0f0a82b3551fb1d0dfa956 (diff) | |
| parent | 7109133e650b0b1a69690bda620e64893c027d95 (diff) | |
| download | packages_providers_ContactsProvider-2cfbcb88ed85ac0a0bc93f558d5d7928be762102.zip packages_providers_ContactsProvider-2cfbcb88ed85ac0a0bc93f558d5d7928be762102.tar.gz packages_providers_ContactsProvider-2cfbcb88ed85ac0a0bc93f558d5d7928be762102.tar.bz2 | |
resolved conflicts for merge of 7109133e to master
Change-Id: Ia0300d116a82a7b006aa863ae807153623c85c47
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -5,6 +5,8 @@ LOCAL_MODULE_TAGS := optional # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES += \ + src/com/android/providers/contacts/EventLogTags.logtags LOCAL_JAVA_LIBRARIES := ext |