diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-04 14:54:19 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-07 15:21:54 +0000 |
| commit | 10ae593a59aa50963e1d3159747da2d65ca79bed (patch) | |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /Android.mk | |
| parent | e1a73952372a7ceee493863520e5046e6d979dc0 (diff) | |
This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.
This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2
Test: make
master is already up to date and
Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9
Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index efbdb0973..beccd865a 100644 --- a/Android.mk +++ b/Android.mk @@ -118,6 +118,7 @@ RES_DIRS := \ $(BASE_DIR)/incallui/telecomeventui/res \ $(BASE_DIR)/incallui/video/impl/res \ $(BASE_DIR)/incallui/video/protocol/res \ + $(BASE_DIR)/voicemail/impl/configui/res \ $(BASE_DIR)/voicemail/impl/res \ @@ -178,6 +179,7 @@ DIALER_MANIFEST_FILES += \ $(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \ $(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \ $(BASE_DIR)/voicemail/AndroidManifest.xml \ + $(BASE_DIR)/voicemail/impl/configui/AndroidManifest.xml \ $(BASE_DIR)/voicemail/impl/AndroidManifest.xml \ @@ -257,6 +259,7 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.incallui.video.impl \ --extra-packages com.android.phone.common \ --extra-packages com.android.voicemail \ + --extra-packages com.android.voicemail.impl.configui \ --extra-packages com.android.voicemail.impl \ --extra-packages com.android.voicemail.impl.fetch \ --extra-packages com.android.voicemail.impl.settings \ @@ -554,4 +557,4 @@ LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) -include $(CLEAR_VARS) +include $(CLEAR_VARS)
\ No newline at end of file |