Merge changes Ie12fd2f4,If92e7595 am: c3409a7f7a am: 71064e2aa5
am: 49b40c72a8

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