OSDN Git Service

am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
authorXavier Ducrohet <xav@google.com>
Fri, 9 May 2014 02:13:32 +0000 (02:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 May 2014 02:13:32 +0000 (02:13 +0000)
* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
  Remove SDK Tools from platform builds.

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge