commit 087e2d46ab615a62c768295441ac9d508874d34b
author Yi Kong <yikong@google.com> Tue May 02 12:49:25 2017 -0700
committer Yi Kong <yikong@google.com> Tue May 02 12:49:25 2017 -0700
tree 3cd9eaec63b9b8a779ac2862b393e77f1a2b0d8d
parent 7f2cc46a0fd89575324742d100ecfd178fd8ef74
parent ccc5b9bbd02ac3bca58e61295b1f3dd61edc0f72

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

Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9

tools/aapt2/ResourceParser.cpp

diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index 90f713b..6dfabf1 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -934,7 +934,7 @@
   }
 
   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();
     }
   };