diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2017-02-15 17:23:08 -0800 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2017-02-15 17:23:08 -0800 |
| commit | a37420cdc8eb5dfbc1ee117ad81d93a7c175aa4d (patch) | |
| tree | 7c35dbd3aa33c7edaf3e8a09bdaf9a9c912025aa /AndroidManifest.xml | |
| parent | b8c4512b4a6d3e78d426e7e67b502e4735e365cf (diff) | |
| parent | c640e2c46a3676d397545fa882388c6fa02a25b0 (diff) | |
| download | android_packages_apps_DeskClock-a37420cdc8eb5dfbc1ee117ad81d93a7c175aa4d.tar.gz android_packages_apps_DeskClock-a37420cdc8eb5dfbc1ee117ad81d93a7c175aa4d.tar.bz2 android_packages_apps_DeskClock-a37420cdc8eb5dfbc1ee117ad81d93a7c175aa4d.zip | |
resolve merge conflicts of c640e2c46 to ub-deskclock-huddle
Change-Id: I470ddbf6a1225809501ce573791031b5604b330a
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e2e1e81dd..100712e81 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,9 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.deskclock" - android:versionCode="500" - android:versionName="5.0.0"> + package="com.android.deskclock"> <original-package android:name="com.android.alarmclock" /> <original-package android:name="com.android.deskclock" /> |