OSDN Git Service

Merge \\\"Remove Android.bp logic from makefiles\\\" am: 8bc18d35ec am: 7dc26e8aa8
authorColin Cross <ccross@android.com>
Tue, 12 Jul 2016 16:31:52 +0000 (16:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:31:52 +0000 (16:31 +0000)
am: 95ebfddd5f

Change-Id: I22073f2e6788db034f7a904600100d590efec272

1  2 
core/main.mk

diff --cc core/main.mk
Simple merge