diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
| commit | cded3beaf28a703e1ef8f71bbc6836e6806c3736 (patch) | |
| tree | c1b5e8199b5996fc848e7455d04126b9cdbb3c39 /java/com/android/dialer/about | |
| parent | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (diff) | |
Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"
This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.
Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.
Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
Diffstat (limited to 'java/com/android/dialer/about')
| -rw-r--r-- | java/com/android/dialer/about/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/about/res/raw/keep.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/java/com/android/dialer/about/AndroidManifest.xml b/java/com/android/dialer/about/AndroidManifest.xml index 85c750826..e9489ce1e 100644 --- a/java/com/android/dialer/about/AndroidManifest.xml +++ b/java/com/android/dialer/about/AndroidManifest.xml @@ -1,6 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dialer.about"> - <application android:theme="@style/Theme.AppCompat"> + <application> <activity android:name="com.android.dialer.about.LicenseMenuActivity" android:label="@string/licenseActivityLabel" diff --git a/java/com/android/dialer/about/res/raw/keep.xml b/java/com/android/dialer/about/res/raw/keep.xml index 9215627d1..e41b8b8d0 100644 --- a/java/com/android/dialer/about/res/raw/keep.xml +++ b/java/com/android/dialer/about/res/raw/keep.xml @@ -16,3 +16,4 @@ --> <resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@raw/*"/> + |