Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83d512c5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Make android:cantSaveState an optional feature." into pi-dev am: 71408255

am: cb9a80e9

Change-Id: Idec14333adf37520fa2ad31d8aadaf176187e16d
parents 2b88ec0b cb9a80e9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@
    <feature name="android.software.print" />
    <feature name="android.software.companion_device_setup" />
    <feature name="android.software.autofill" />
    <feature name="android.software.cant_save_state" />

    <!-- Feature to specify if the device supports adding device admins. -->
    <feature name="android.software.device_admin" />
+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@
    <feature name="android.software.print" />
    <feature name="android.software.companion_device_setup" />
    <feature name="android.software.autofill" />
    <feature name="android.software.cant_save_state" />

    <!-- Feature to specify if the device supports adding device admins. -->
    <feature name="android.software.device_admin" />
+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@
    <feature name="android.software.print" />
    <feature name="android.software.companion_device_setup" />
    <feature name="android.software.autofill" />
    <feature name="android.software.cant_save_state" />

    <!-- Feature to specify if the device supports adding device admins. -->
    <feature name="android.software.device_admin" />