tree 19438598541fb52c422a6c36d96e7f5b9f912f7e
parent 6b9b36a088388e04ddaceccee36e11d2e834f851
parent 9036840e975b2e0b42b66446ba125a8e4537f4fb
author Avery Pennarun <apenwarr@gmail.com> 1392681406 -0500
committer Avery Pennarun <apenwarr@gmail.com> 1392681715 -0500

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

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

Conflicts:
	default.xml

Change-Id: I42bc26aed2016dc264d82beaeb69e64a29b4613a