summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Raph Levien <raph@google.com> 2012-05-11 11:07:02 -0700
committer Raph Levien <raph@google.com> 2012-05-11 11:48:57 -0700
commit3816174b3bea63eb355a0aa212c6b51e9435627b (patch)
tree8e096aa060e7fbbdd36fdf75f0c05662633d1788
parent26511012c40dbe704f4791654b28b9e0e05589d8 (diff)
Add explicit id for fontFamily attribute.
The merge for the attribute crossed in flight with making jb-dev a release branch. Change-Id: Ic9a2a34a8e3c54efa17a98365f58f24fe365b532
-rw-r--r--core/res/res/values/public.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index bcc7cd9301a5..29a94afb95a8 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3604,7 +3604,6 @@
<public type="attr" name="isolatedProcess" id="0x010103a9" />
<public type="attr" name="importantForAccessibility" id="0x010103aa" />
<public type="attr" name="kcm" id="0x010103ab" />
-
- <public type="attr" name="fontFamily" />
+ <public type="attr" name="fontFamily" id="0x010103ac" />
</resources>