OSDN Git Service

Merge "Update Android.bp to match Android.mk"
authorColin Cross <ccross@android.com>
Wed, 20 Jan 2016 20:09:06 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jan 2016 20:09:06 +0000 (20:09 +0000)
commit966377d273cb1909d8e06f1d117891d71ffe99e7
tree067136d2400a7426bde748dceb5a02fbbddaa0db
parentff03d820b7ce90fdc86919e611768175a347e11e
parent18dea9b8d41a05597f0f5e05cb82b1f347059a26
Merge "Update Android.bp to match Android.mk"
am: 18dea9b8d4

* commit '18dea9b8d41a05597f0f5e05cb82b1f347059a26':
  Update Android.bp to match Android.mk