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

This commit is contained in:
TreeHugger Robot
2017-05-02 19:54:21 +00:00
committed by Android (Google) Code Review

View File

@@ -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();
}
};