OSDN Git Service

Merge "Don\'t use ziptime with unbundled builds" am: 29a6675983 am: 3665246dcb
authorDan Willemsen <dwillemsen@google.com>
Wed, 4 Nov 2015 00:47:24 +0000 (00:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Nov 2015 00:47:24 +0000 (00:47 +0000)
am: 8ccf645f94

* commit '8ccf645f94c0b21c6407576df0ba0990d96167b1':
  Don't use ziptime with unbundled builds

1  2 
core/config.mk

diff --cc core/config.mk
Simple merge