OSDN Git Service

Merge changes Ia3bcece1,Icd26dc1e
authorDan Willemsen <dwillemsen@google.com>
Sat, 9 Sep 2017 19:21:16 +0000 (19:21 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 9 Sep 2017 19:21:16 +0000 (19:21 +0000)
commitec462238f68e4be2baf59b841bc96ba0d2a7fb36
treebee72eace47c2e531c02645bd197a0705c39a243
parent8157ab2a0e1ae9d84debe7ad3ef8d889a4a203b4
parent896f01879b424e4f37e65bcf546dc9d5cd712e25
Merge changes Ia3bcece1,Icd26dc1e

* changes:
  Don't compile libaapt with the build number
  aapt: Always use our libz