Merge changes I2f94d863,Id7f5ce4b,I1c0b5b42,I4d8d8de8,I3765a9ae, ...
am: 2cb0136378

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