Merge "Convert Colors from GLSurfaceView to TextureView." into jb-mr1-dev
tree: ab77aa48c316b583d21c426b8d632641af5f3151
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml