tree b4024da32f7efda53b7379538a27efd2c17177ce
parent 4ca60b146b4d5812e9ff7c4a754ff9d564807c9b
parent c687f84ed2c38a6c9c1a745ff277385cfb0b14d6
author Avery Pennarun <apenwarr@gmail.com> 1389068690 -0500
committer Avery Pennarun <apenwarr@gmail.com> 1389068690 -0500

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

* origin/master:
  Add vendor/firmware repo

Conflicts:
	default.xml

Change-Id: Ia9b9e028afb86c44e2dbf53645a42a2b51124cc1