OSDN Git Service

am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
authorYing Wang <wangying@google.com>
Wed, 12 Feb 2014 23:00:18 +0000 (23:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Feb 2014 23:00:18 +0000 (23:00 +0000)
* commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
  Support custom sdk.atree files.

1  2 
core/Makefile
core/product.mk

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