diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:29 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:29 -0500 |
| commit | 01b86c8784cd1590bfd7c467abc89880e9a12814 (patch) | |
| tree | a04f8cc8c01c3499810b6eea0b38809ce7a7533e /samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml | |
| parent | 132f0a9d42a59fcb96a34c8781da690fa97332d7 (diff) | |
| parent | 99bfeb590ea8105d24ff0fdc6e41bed981483ee4 (diff) | |
| download | android_development-staging/cm-14.1_android-7.1.2_r2.tar.gz android_development-staging/cm-14.1_android-7.1.2_r2.tar.bz2 android_development-staging/cm-14.1_android-7.1.2_r2.zip | |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2
Android 7.1.2 Release 2 (N2G47E)
# gpg: Signature made Mon 03 Apr 2017 01:41:41 AM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Diffstat (limited to 'samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml')
| -rw-r--r-- | samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml b/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml index 1c3b255fa..1f8a43198 100644 --- a/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml +++ b/samples/browseable/BasicAndroidKeyStore/AndroidManifest.xml @@ -26,7 +26,7 @@ <application android:allowBackup="true" android:label="@string/app_name" - android:icon="@drawable/ic_launcher" + android:icon="@mipmap/ic_launcher" android:theme="@style/AppTheme"> <activity android:name=".MainActivity" |