tree 42570b4c87251ba51cdb17fd40e603d69cad8082
parent f4873d4f90bb18881c6da7c314f8e93efeef8e96
parent e0b1224ea301ed33b1202129d204f8cac2f3285c
author Avery Pennarun <apenwarr@gmail.com> 1471657477 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1471657477 -0400

Merge commit 'e0b1224ea301ed33b1202129d204f8cac2f3285c' into default

* commit 'e0b1224ea301ed33b1202129d204f8cac2f3285c':
  Add project for minijail.
  Create 'wifitv' branch.

Change-Id: I2ba64aaab2fc5509b9d02c11ba288cea19f83f86