Merge "Resolve merge conflicts of ccc5b9bbd0 to oc-dev-plus-aosp" into oc-dev-plus-aosp

am: 51ccc24d57 Change-Id: Ib6109c22c278ce00ad1a0c6d3d1e6a7903cfad2f
2017-05-02 20:00:21 +00:00
parent 8a532cf257 51ccc24d57
commit bf0a3ec0fa
1 changed files with 1 additions and 1 deletions
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -934,7 +934,7 @@ bool ResourceParser::ParseAttrImpl(xml::XmlPullParser* parser,
  }

  struct SymbolComparator {
-    bool operator()(const Attribute::Symbol& a, const Attribute::Symbol& b) {
+    bool operator()(const Attribute::Symbol& a, const Attribute::Symbol& b) const {
      return a.symbol.name.value() < b.symbol.name.value();
    }
  };