Merge changes I620aacf3,Ie5fe2fc1,I41f98fe2
am: 30842b2099

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