Merge changes If11b88a0,I34444857,Ie64f7daa am: 252fed4f12 am: 0a7e44ef1f
am: ca0d01a8ee

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