| commit | 93d598d92ca3616e3800eba93caf05969ff618ba | [log] [tgz] |
|---|---|---|
| author | Avery Pennarun <apenwarr@gmail.com> | Fri Jan 24 21:22:39 2014 -0500 |
| committer | Avery Pennarun <apenwarr@gmail.com> | Fri Jan 24 21:22:39 2014 -0500 |
| tree | c53b4e65300c72442c50c3986630595186424a0d | |
| parent | f02f0b716fdc66d961c7cafd204d90bd6c0da587 [diff] | |
| parent | 7cecab0258992aebeb7baa5d5c94e2a7828e4ec5 [diff] |
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