tree c53b4e65300c72442c50c3986630595186424a0d
parent f02f0b716fdc66d961c7cafd204d90bd6c0da587
parent 7cecab0258992aebeb7baa5d5c94e2a7828e4ec5
author Avery Pennarun <apenwarr@gmail.com> 1390616559 -0500
committer Avery Pennarun <apenwarr@gmail.com> 1390616559 -0500

Merge remote-tracking branch 'origin/master' into openbox

* origin/master:
  Add vendor/marvell/manufacturing to the manifest
  Add bluez

Conflicts:
	default.xml

Change-Id: I1e27efe03c2704d60bf4f388529a1e6eadc06937