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 /AndroidManifest.xml | |
| 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 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 79912dc66..5420ec05c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" coreApp="true" package="com.android.dialer" - android:versionCode="160000" - android:versionName="12.0"> + android:versionCode="150000" + android:versionName="11.0"> <uses-sdk android:minSdkVersion="23" @@ -114,7 +114,6 @@ android:usesCleartextTraffic="false"> - </application> </manifest> |