OSDN Git Service

resolved conflicts for merge of da92aef7 to master
authorBrian Carlstrom <bdc@google.com>
Sat, 28 Jun 2014 20:49:26 +0000 (13:49 -0700)
committerBrian Carlstrom <bdc@google.com>
Sat, 28 Jun 2014 20:54:24 +0000 (13:54 -0700)
commit191e5988d077007e42e1706810c0999abd35ca8d
tree29bd71e2764b576cf48d11c5f55965ac63783757
parent8d43e17bfdf7fb9bd22d02665005f226d9d35a81
parentda92aef762fbdf60245746932354998515b68d57
resolved conflicts for merge of da92aef7 to master

Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
core/executable_prefer_symlink.mk