OSDN Git Service

Merge "Update Android.mk finder to work with Android.bp files" am: 520442f053
authorColin Cross <ccross@android.com>
Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)
commit01437aa5d331c3cfe75839ff05f66412cc45f1f4
treec9798d0df54fc612052edb2d96f8da2b44850c03
parent6532011f9f53aba67ff97a876e934aa48d7fa65e
parent18023b557b6d33836de380df397fce10598931a9
Merge "Update Android.mk finder to work with Android.bp files" am: 520442f053
am: 18023b557b

* commit '18023b557b6d33836de380df397fce10598931a9':
  Update Android.mk finder to work with Android.bp files

Change-Id: I87915d75c3bda9c41c926a7c8ad7c650ac085199
core/definitions.mk
core/main.mk