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 am: 7c65d085f4

Browse Source 
am: 0b94321ecc

* commit '0b94321ecc9c098e4af5fadcf6a300a6baac1cbe':
  Fix the feldspar-dev branch

Change-Id: I771d9e620a9e627cc4f76d16e6b838f7b2fae678
This commit is contained in:
Makoto Onuki
2016-05-27 23:41:01 +00:00
committed by android-build-merger
parent 2745da17e0 0b94321ecc
commit 92aca78996
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

@@ -8247,7 +8247,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" />