diff options
| author | Neil Fuller <nfuller@google.com> | 2015-03-31 11:15:39 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2015-03-31 11:15:39 +0100 |
| commit | cea283535cfecc81565c07597d8db2674e76578a (patch) | |
| tree | e1b048c36753cba67d7321eac1f661c6030ecbae /services/core/Android.mk | |
| parent | b12dcfb1b12c13e01743567145f01e7d389afdbb (diff) | |
| parent | 962a11ad5bf0cc88d40f416a4a0be6ab8d242ad7 (diff) | |
| download | frameworks_base-cea283535cfecc81565c07597d8db2674e76578a.zip frameworks_base-cea283535cfecc81565c07597d8db2674e76578a.tar.gz frameworks_base-cea283535cfecc81565c07597d8db2674e76578a.tar.bz2 | |
resolved conflicts for merge of 962a11ad to master
Change-Id: I8c6ac62d7267629c019997bb343d863aa56264eb
Diffstat (limited to 'services/core/Android.mk')
| -rw-r--r-- | services/core/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/Android.mk b/services/core/Android.mk index 1a0fa34..64b6134 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -10,5 +10,6 @@ LOCAL_SRC_FILES += \ java/com/android/server/am/EventLogTags.logtags LOCAL_JAVA_LIBRARIES := telephony-common +LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update include $(BUILD_STATIC_JAVA_LIBRARY) |