OSDN Git Service

am 4548e7f4: Merge "Remove AndroidConfig.h."
authorElliott Hughes <enh@google.com>
Fri, 28 Aug 2015 19:59:18 +0000 (19:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 19:59:18 +0000 (19:59 +0000)
* commit '4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
  Remove AndroidConfig.h.

1  2 
core/clang/config.mk
core/config.mk

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