tree dc6ff3b451c8859c5d9d95f69e92baa5f7a415ad
parent 9c970eee778ef50bc6313d715629a9a3d9fc22bc
parent e2154883341df9bac61c7784bc10d667f7ab00e9
author Steven Moreland <smoreland@google.com> 1507091366 +0000
committer android-build-merger <android-build-merger@google.com> 1507091366 +0000

Merge "Convert java hwbinder mk -> bp." am: 53c945fb71 am: 7bebf15460
am: e215488334

Change-Id: Ic24c9d2af58e58aa97e0ad1f8b2ff50f7db66007