OSDN Git Service

Merge "Update Android.bp with recent Android.mk changes" am: bb3add2125
authorDan Willemsen <dwillemsen@google.com>
Mon, 29 Feb 2016 19:13:01 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Feb 2016 19:13:01 +0000 (19:13 +0000)
commit1ce2bfa38d7ffe7fcb087920f4af58e9c80b924a
tree12276471739a32c24804b8459c376bf0038a793e
parent6b76eac89ec6824192f493e0eac2ca12630458b6
parent85884137d928f855a2feafe589a3a6127278b22d
Merge "Update Android.bp with recent Android.mk changes" am: bb3add2125
am: 85884137d9

* commit '85884137d928f855a2feafe589a3a6127278b22d':
  Update Android.bp with recent Android.mk changes