Merge changes I84ec0ac5,I2b92e1e0,Ic30fa6c6

* changes:
  Move Duo related constants out of interface
  Dismissing location prompt now actually prevents it from reshowing.
  Add GSM conference calling to simulator.
tree: 91fb2d0f5c065f024a7332ec664c794cdf30f413
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE