Merge changes If86250b1,Ib2a01013 am: 4114f539e7 am: c65e72a520
am: 819575fb35

Change-Id: I06573804b589dc8be32b2d7517244f4c7cf103d5
tree: abe92880449fd62a812cbbef4fae354aa065dc18
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE