OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbfebfa 7b734fd)
am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 5 Feb 2014 00:49:37 +0000 (00:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Feb 2014 00:49:37 +0000 (00:49 +0000)
* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt

1  2 
core/package.mk patch | diff1 | diff2 | blob | history

diff --cc core/package.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help