Merge changes If11b88a0,I34444857,Ie64f7daa
am: 252fed4f12

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