OSDN Git Service

Merge "Update Android.bp to match Android.mk" am: 18dea9b8d4
authorColin Cross <ccross@android.com>
Wed, 20 Jan 2016 20:11:25 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jan 2016 20:11:25 +0000 (20:11 +0000)
commitb0aca0f5aa4830f98bb3bbbc55a6577b4bdce619
treee798dafbce6b82b3426017f20c9d16033ee6756b
parent45ce099db42a82f895afbaa59ca76e22e1eb0786
parent966377d273cb1909d8e06f1d117891d71ffe99e7
Merge "Update Android.bp to match Android.mk" am: 18dea9b8d4
am: 966377d273

* commit '966377d273cb1909d8e06f1d117891d71ffe99e7':
  Update Android.bp to match Android.mk