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

Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index 90f713b67985..6dfabf1e9aba 100644
--- 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();
     }
   };