OSDN Git Service

Merge "Don\'t run ziptime on host zip files." am: 7f50cf7f50 am: 3a5c02e295
authorYing Wang <wangying@android.com>
Wed, 4 Nov 2015 18:45:19 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Nov 2015 18:45:19 +0000 (18:45 +0000)
commit16a27b40eb9acbd2b36918bd85a2b99c397fbc66
treee858bcbe43874dfb5a212edb1952e12f695a3f56
parente441c9fc3d541918898f2157fd8082a0a319d3ea
parent3932de119a79ec3ddf5972722a9cb6fb8e4526b1
Merge "Don\'t run ziptime on host zip files." am: 7f50cf7f50 am: 3a5c02e295
am: 3932de119a

* commit '3932de119a79ec3ddf5972722a9cb6fb8e4526b1':
  Don't run ziptime on host zip files.
core/Makefile
core/droiddoc.mk