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 /java/com/android/incallui/maps/impl/AndroidManifest.xml | |
parent | e1a73952372a7ceee493863520e5046e6d979dc0 (diff) | |
download | android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.gz android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.bz2 android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.zip |
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 'java/com/android/incallui/maps/impl/AndroidManifest.xml')
-rw-r--r-- | java/com/android/incallui/maps/impl/AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/java/com/android/incallui/maps/impl/AndroidManifest.xml b/java/com/android/incallui/maps/impl/AndroidManifest.xml index bc921e906..4ad0b3b7e 100644 --- a/java/com/android/incallui/maps/impl/AndroidManifest.xml +++ b/java/com/android/incallui/maps/impl/AndroidManifest.xml @@ -19,7 +19,6 @@ package="com.android.incallui.maps.impl"> <application> - <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/> |