OSDN Git Service

resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3
authorChih-Hung Hsieh <chh@google.com>
Fri, 12 Aug 2016 19:35:08 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 19:35:08 +0000 (19:35 +0000)
commit84717d4118cff0790aecd8365029200e36a47bba
tree341d9323e8ab24bf4809d6dc6cacec723b8d9d2a
parent2de53cbfae1dd609d6f9561eef8423c4ee811121
parentc76aa692075acfef74349185d86062bbfec5a8c0
resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3
am: c76aa69207

Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b
tools/aapt/Command.cpp
tools/aapt/Resource.cpp
tools/aapt/ResourceTable.cpp
tools/aapt2/ResourceTable.cpp
tools/aapt2/ResourceTable.h
tools/aapt2/ResourceValues.h