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

Commit 7c65d085 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix the feldspar-dev branch" into nyc-mr1-dev

parents d6e53321 b8ea2fda
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8240,7 +8240,7 @@ i

    <declare-styleable name="Shortcut">
        <attr name="shortcutId" format="string" />
        <attr name="enabled" format="boolean" />
        <attr name="enabled" />
        <attr name="shortcutRank" format="integer" />
        <attr name="shortcutIcon" format="reference" />
        <attr name="shortcutTitle" format="reference" />