OSDN Git Service

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

Change-Id: Iad45e3fd9b172c94df46d20425e51ae7477b5a2d


Trivial merge