OSDN Git Service

Merge "Update Android.bp to match Android.mk"
authorColin Cross <ccross@android.com>
Wed, 20 Jan 2016 23:23:41 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jan 2016 23:23:41 +0000 (23:23 +0000)
commiteec1830d4d18c511bad6b9ef33bc38de7b5dac17
tree75057e769d60f2fe05e50344a518deb37230dae4
parent966377d273cb1909d8e06f1d117891d71ffe99e7
parent0904e878aed336b95512f12948fd4dcc56100d00
Merge "Update Android.bp to match Android.mk"
am: 0904e878ae

* commit '0904e878aed336b95512f12948fd4dcc56100d00':
  Update Android.bp to match Android.mk