OSDN Git Service

resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Sat, 8 Feb 2014 18:31:36 +0000 (10:31 -0800)
committerYing Wang <wangying@google.com>
Sat, 8 Feb 2014 18:31:46 +0000 (10:31 -0800)
commit960d919e814726f05ad1a9b82e6a9677f9977f15
tree6467a4fa91af2edee74930ba37ae77f94409ffdc
parenta6e8c6c1e0f659b3532bd86631104360b54016ea
parent4df82b3e30794a3652a5dda773a74f486fec3325
resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp

Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
core/clear_vars.mk
core/definitions.mk
core/java.mk