tree bee72eace47c2e531c02645bd197a0705c39a243
parent 8157ab2a0e1ae9d84debe7ad3ef8d889a4a203b4
parent 896f01879b424e4f37e65bcf546dc9d5cd712e25
author Dan Willemsen <dwillemsen@google.com> 1504984876 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1504984876 +0000

Merge changes Ia3bcece1,Icd26dc1e

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