Resolve merge conflicts of ccc5b9bbd0 to oc-dev-plus-aosp

Test: Build Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9
2017-05-02 12:49:25 -07:00
parent 7f2cc46a0f ccc5b9bbd0
commit 087e2d46ab
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();
    }
  };