Merge changes Ief58171c,Ie48671dc am: 48824769e0 am: 7119f5327f
am: 03ec3a1a01

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