OSDN Git Service

am fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
authorYing Wang <wangying@google.com>
Tue, 15 Apr 2014 16:12:26 +0000 (16:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Apr 2014 16:12:26 +0000 (16:12 +0000)
* commit 'fcd22c8848b829eec7e661fb270fea1a18bcba28':
  Allow to build target-files.zip in sdk build.

1  2 
core/Makefile
core/main.mk

diff --cc core/Makefile
Simple merge
diff --cc core/main.mk
Simple merge