OSDN Git Service

resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp
authorAndrew Hsieh <andrewhsieh@google.com>
Wed, 11 Sep 2013 01:07:23 +0000 (18:07 -0700)
committerAndrew Hsieh <andrewhsieh@google.com>
Wed, 11 Sep 2013 01:07:23 +0000 (18:07 -0700)
commit246daf755a6607db575b5bef13d5cc761d4ebbb0
treedac4527ebb813b4e8b0714e2a506888952cc5fd1
parent46f00b6167f4c23dd4874abe9377bac85e965b2f
parent2b5d2c55bf8c9ced15cfbebe94f0068351f84171
resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp

Change-Id: Icd9d5eff3f9acba042c100f694309f902c9d56cf
core/binary.mk
core/clear_vars.mk
core/config.mk
envsetup.sh