am c30779b9: Oops! I was totally misunderstanding what was going wrong!!

Merge commit 'c30779b9aa9fa2dd7946b8af63a4fb72d50a99dd'

* commit 'c30779b9aa9fa2dd7946b8af63a4fb72d50a99dd':
  Oops! I was totally misunderstanding what was going wrong!!
tree: 08e2a51f153fade418d16940b71c5d4d5ae00717
  1. android/
  2. dist/