commit 10ae35759ef6bddb8859daea59e8e1a801c0e79d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 01 09:46:56 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 01 09:46:57 2017 +0000
tree a7fe6d225032a091622da398273fb32d9aa5ec95
parent 2e32944e0842da93de48f6a7559896608dd42b4d
parent f490f15fd64ccc8bbad10976f3efc33c44c0bd4b

Merge "Fix public attribute name of fetch strategy." into oc-support-26.0-dev

compat/res-public/values/public_attrs.xml

diff --git a/compat/res-public/values/public_attrs.xml b/compat/res-public/values/public_attrs.xml
index eb60607..e45f8c2 100644
--- a/compat/res-public/values/public_attrs.xml
+++ b/compat/res-public/values/public_attrs.xml
@@ -21,8 +21,8 @@
      <public type="attr" name="fontProviderPackage"/>
      <public type="attr" name="fontProviderQuery"/>
      <public type="attr" name="fontProviderCerts"/>
-     <public type="attr" name="fontProviderStrategy"/>
-     <public type="attr" name="fontProviderTimeout"/>
+     <public type="attr" name="fontProviderFetchStrategy"/>
+     <public type="attr" name="fontProviderFetchTimeout"/>
      <public type="attr" name="fontStyle"/>
      <public type="attr" name="font"/>
      <public type="attr" name="fontWeight"/>