resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp

Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/aapt/XMLNode.h b/tools/aapt/XMLNode.h
index 05624b745176..ccbf9f403116 100644
--- a/tools/aapt/XMLNode.h
+++ b/tools/aapt/XMLNode.h
@@ -26,7 +26,7 @@ status_t parseStyledString(Bundle* bundle,
                            String16* outString,
                            Vector<StringPool::entry_style_span>* outSpans,
                            bool isFormatted,
-                           bool isPseudolocalizable);
+                           PseudolocalizationMethod isPseudolocalizable);
 
 void printXMLBlock(ResXMLTree* block);