Merge changes I8578dd2c,Ia8e581f1
am: b21b9f9b2e

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