OSDN Git Service

Merge changes I1a4b3ce5,Id7216e5b
authorAdam Lesinski <adamlesinski@google.com>
Fri, 20 Oct 2017 19:15:54 +0000 (19:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Oct 2017 19:15:54 +0000 (19:15 +0000)
commit7fd74b5ad1df53b92f08a9aa2f3d445bf7b786fe
tree03bbf941ec0fead1ad64ba2acd06113486a612c1
parent4bf7416a062af25574f548846e60e88df332cc55
parente59f0d80ec19249f72c07ae191ad673d040443e3
Merge changes I1a4b3ce5,Id7216e5b

* changes:
  AAPT2: Enable building proto artifacts
  AAPT2: Define and Implement AAPT Container Format
tools/aapt2/ResourceValues.cpp