Merge changes Ie12fd2f4,If92e7595
am: c3409a7f7a

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