OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86c0cf6 441e945)
am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp
authorColin Cross <ccross@android.com>
Thu, 27 Mar 2014 00:14:05 +0000 (00:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Mar 2014 00:14:05 +0000 (00:14 +0000)
* commit '441e9452488ccb98f7b0a7690b86fcdff733e5f0':
  add support for LOCAL_MULTILIB

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

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