Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 7c65d085f4

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

Change-Id: Ifd22a00c0e9bf27e937cefa46cc317bf9ebc4496
This commit is contained in:
Makoto Onuki
2016-05-27 19:25:52 +00:00
committed by android-build-merger
parent 268aa24fe6 7c65d085f4
commit 0b94321ecc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/attrs.xml
View File

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