Merge changes Ie58920b7,Iaaf84ab9
am: 904eb21b49

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