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

Commit 0b94321e authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

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

am: 7c65d085

* commit '7c65d085':
  Fix the feldspar-dev branch

Change-Id: Ifd22a00c0e9bf27e937cefa46cc317bf9ebc4496
parents 268aa24f 7c65d085

core/res/res/values/attrs.xml

+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" />