OSDN Git Service

resolved conflicts for merge of f8e4d1b7 to master
authorColin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)
committerColin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)
commitf2b60c0f8052ed6b456e2f63a0e6798d049410ad
tree1ef8e88b2188c0c7007b8c459d1cb1c70905779b
parente3290e9e46c2df798e08f3d939dd58de8d3d0862
parentf8e4d1b730e101bbb3b4fb6fe2ac4bb267cf5371
resolved conflicts for merge of f8e4d1b7 to master

Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94
target/product/base.mk
target/product/core_minimal.mk