Merge changes I4b5a494b,I4b6f7ca8
am: 4662229bb3

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