| commit | e1d69c9d5aa3f359889fc73572a45cb89be2440a | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Wed Jul 22 13:02:22 2015 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Wed Jul 22 13:06:28 2015 -0700 |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 | |
| parent | 96edc4c8d0e9cf24c59b83157c3d57a47e839e49 [diff] [blame] |
resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp Change-Id: Iec5916b2323d0fb36b4d619da9e6c4e0d57a9b56
diff --git a/WallpaperPicker/AndroidManifest.xml b/WallpaperPicker/AndroidManifest.xml index 86a94d0..cb1457b 100644 --- a/WallpaperPicker/AndroidManifest.xml +++ b/WallpaperPicker/AndroidManifest.xml
@@ -5,6 +5,6 @@ android:versionName="1.0" > - <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" /> - + <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" /> + <application/> </manifest>