tools/aapt/Main.cpp | 3 1 + 2 - 0 !
tools/aapt2/util/Util.cpp | 6 1 + 5 - 0 !
2 files changed, 2 insertions(+), 7 deletions(-)

---

tools/aapt/StringPool.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix a typo

libs/androidfw/include/androidfw/LoadedArsc.h | 2 1 + 1 - 0 !
tools/aapt2/util/Files.cpp | 2 1 + 1 - 0 !
tools/aapt2/util/Files.h | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 fix std::vector must have a non-const, non-volatile value_type

tools/aapt2/Resources.proto | 2 1 + 1 - 0 !
tools/aapt2/ResourcesInternal.proto | 4 2 + 2 - 0 !
2 files changed, 3 insertions(+), 3 deletions(-)

 fix proto import paths, this dir layout is different