OSDN Git Service

fix bad merge conflict resolution
authorColin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:41:26 +0000 (17:41 -0700)
committerColin Cross <ccross@android.com>
Sat, 22 Mar 2014 00:41:26 +0000 (17:41 -0700)
commitcf1f9d2d67411b91c6bc07a12595753471d86b8b
treedec2dc8b2e897c450b183afeb4e85ebdf66614fc
parentf2b60c0f8052ed6b456e2f63a0e6798d049410ad
fix bad merge conflict resolution

Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
target/product/core_minimal.mk