tree 19e03f94cfe05f77f5b5e330061c9ce3d4297d5b
parent ae1bf3808a2274b55c6dcd386745d9082d22efb4
parent bd69bff61e4cc9b9c894e5d2a27cabf26f8db856
author Avery Pennarun <apenwarr@gmail.com> 1368569429 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1368569461 -0400

Merge remote-tracking branch 'origin/prism_dev'

* origin/prism_dev:
  Merge prism.xml into default.xml.
  Add opensource/tarballs to prism.
  Add manifest file for ONT(prism).

Change-Id: Ifef52880eebed78b1d53fc5961d7b1eb762734f9