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

Commit bf0a3ec0 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

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

am: 51ccc24d

Change-Id: Ib6109c22c278ce00ad1a0c6d3d1e6a7903cfad2f
parents 8a532cf2 51ccc24d
Loading
Loading
Loading
Loading
+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();
    }
  };