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

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