Merge commit '70da83381f77e0ee9ada47eafaae395038ff77ad' into tgunn-mncvtdev-to-master-2015-12-04
tree: 3f1bb4d689f11dcb3e36ec0ba512b4ecf1f0e0dc
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py