OSDN Git Service

am d5deac8d: Merge "Add _(darwin|linux|windows)"
authorDan Willemsen <dwillemsen@google.com>
Fri, 28 Aug 2015 03:49:01 +0000 (03:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 03:49:01 +0000 (03:49 +0000)
* commit 'd5deac8db951ec0a1c9edd806ea1758b836f8c46':
  Add _(darwin|linux|windows)

1  2 
core/base_rules.mk
core/binary.mk
core/clear_vars.mk

Simple merge
diff --cc core/binary.mk
Simple merge
Simple merge