OSDN Git Service

Merge "Update Android.bp to match Android.mk" am: 45d3cf9f0f am: 24c1e2df1c
authorColin Cross <ccross@android.com>
Mon, 2 May 2016 23:40:04 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 23:40:04 +0000 (23:40 +0000)
commit30e1fc0431b9aa6c639165671313b3600c442b06
treef68e97dea6af6cb2728beb14f4018926ed051519
parent9c6db5ccaeaf4515396df7feaade92f2770676a7
parent2ffa600c9a15a1d98bf7a4f1cbe630c53b51faf8
Merge "Update Android.bp to match Android.mk" am: 45d3cf9f0f am: 24c1e2df1c
am: 2ffa600c9a

* commit '2ffa600c9a15a1d98bf7a4f1cbe630c53b51faf8':
  Update Android.bp to match Android.mk

Change-Id: I7244cf520e26a29e3a3c286e4764cccf231460f6