OSDN Git Service

Merge "Update Android.bp to match Android.mk" am: 7ee8e299ba am: d1d62db216
authorColin Cross <ccross@android.com>
Wed, 4 May 2016 21:37:21 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 21:37:21 +0000 (21:37 +0000)
am: 19f0ea49de

* commit '19f0ea49de1dfea9aecbdd00f0d85efa217ddac4':
  Update Android.bp to match Android.mk

Change-Id: I6b66c3f360c3f81eb25a2a57b87ad4e1f1ae2a83


Trivial merge