Merge changes If86250b1,Ib2a01013
am: 4114f539e7

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