OSDN Git Service

Merge "Update Android.bp with recent Android.mk changes"
authorDan Willemsen <dwillemsen@google.com>
Mon, 4 Apr 2016 21:23:47 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Apr 2016 21:23:47 +0000 (21:23 +0000)
commit2e3694533a13525e5ce62f81698452db57c1c4ee
tree6d58cb7f0afe537f44a784619dfa6eacce50d533
parentbf0cceaa66a81f4099ece9a8a49a5c3c5eb1da8c
parent2678c90f7d98a962badfe4bb736a26fb21485c7e
Merge "Update Android.bp with recent Android.mk changes"
am: 2678c90

* commit '2678c90f7d98a962badfe4bb736a26fb21485c7e':
  Update Android.bp with recent Android.mk changes

Change-Id: I79f196a1c97e80479a58b876a33c7e1ecc7b3b4d