Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 087e2d46 authored by Yi Kong's avatar Yi Kong
Browse files

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

Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9
parents 7f2cc46a ccc5b9bb

tools/aapt2/ResourceParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();

    }

  };