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

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