OSDN Git Service

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

* commit '520442f0537c72276147e86116a1170ea1ddc9d7':
  Update Android.mk finder to work with Android.bp files

Change-Id: Ic737bc2d3e693dc7398fff665f7557c3e2e2a72b


Trivial merge