resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3

am: c76aa69207

Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b

diff --cc tools/aapt/Command.cpp
Simple merge

diff --cc tools/aapt/Resource.cpp
Simple merge

diff --cc tools/aapt/ResourceTable.cpp
Simple merge

diff --cc tools/aapt2/ResourceTable.cpp
Simple merge

diff --cc tools/aapt2/ResourceTable.h
Simple merge

diff --cc tools/aapt2/ResourceValues.h
index aa1b550,449ab29..9a6f1a1
--- 1/tools/aapt2/ResourceValues.h
--- 2/tools/aapt2/ResourceValues.h
+++ b/tools/aapt2/ResourceValues.h
@@@ -198,9 -181,8 +198,9 @@@ struct Id : public BaseItem<Id> 
  struct RawString : public BaseItem<RawString> {
      StringPool::Ref value;
  
-     RawString(const StringPool::Ref& ref);
+     explicit RawString(const StringPool::Ref& ref);
  
 +    bool equals(const Value* value) const override;
      bool flatten(android::Res_value* outValue) const override;
      RawString* clone(StringPool* newPool) const override;
      void print(std::ostream* out) const override;
@@@ -209,9 -191,13 +209,9 @@@
  struct String : public BaseItem<String> {
      StringPool::Ref value;
  
-     String(const StringPool::Ref& ref);
+     explicit String(const StringPool::Ref& ref);
  
 -    // Whether the string is marked as translateable. This does not persist when flattened.
 -    // It is only used during compilation phase.
 -    void setTranslateable(bool val);
 -    bool isTranslateable() const;
 -
 +    bool equals(const Value* value) const override;
      bool flatten(android::Res_value* outValue) const override;
      String* clone(StringPool* newPool) const override;
      void print(std::ostream* out) const override;
@@@ -220,9 -209,13 +220,9 @@@
  struct StyledString : public BaseItem<StyledString> {
      StringPool::StyleRef value;
  
-     StyledString(const StringPool::StyleRef& ref);
+     explicit StyledString(const StringPool::StyleRef& ref);
  
 -    // Whether the string is marked as translateable. This does not persist when flattened.
 -    // It is only used during compilation phase.
 -    void setTranslateable(bool val);
 -    bool isTranslateable() const;
 -
 +    bool equals(const Value* value) const override;
      bool flatten(android::Res_value* outValue) const override;
      StyledString* clone(StringPool* newPool) const override;
      void print(std::ostream* out) const override;
@@@ -237,9 -233,8 +237,9 @@@ struct FileReference : public BaseItem<
      io::IFile* file = nullptr;
  
      FileReference() = default;
-     FileReference(const StringPool::Ref& path);
+     explicit FileReference(const StringPool::Ref& path);
  
 +    bool equals(const Value* value) const override;
      bool flatten(android::Res_value* outValue) const override;
      FileReference* clone(StringPool* newPool) const override;
      void print(std::ostream* out) const override;
@@@ -252,10 -247,9 +252,10 @@@ struct BinaryPrimitive : public BaseIte
      android::Res_value value;
  
      BinaryPrimitive() = default;
-     BinaryPrimitive(const android::Res_value& val);
+     explicit BinaryPrimitive(const android::Res_value& val);
      BinaryPrimitive(uint8_t dataType, uint32_t data);
  
 +    bool equals(const Value* value) const override;
      bool flatten(android::Res_value* outValue) const override;
      BinaryPrimitive* clone(StringPool* newPool) const override;
      void print(std::ostream* out) const override;
@@@ -272,9 -266,8 +272,9 @@@ struct Attribute : public BaseValue<Att
      int32_t maxInt;
      std::vector<Symbol> symbols;
  
-     Attribute(bool w, uint32_t t = 0u);
+     explicit Attribute(bool w, uint32_t t = 0u);
  
 +    bool equals(const Value* value) const override;
      Attribute* clone(StringPool* newPool) const override;
      void printMask(std::ostream* out) const;
      void print(std::ostream* out) const override;