am 92ae7a56: (-s ours) Merge "DO NOT MERGE. Implement connection error dialogs (2/4)" into lmp-preview-dev

* commit '92ae7a56f767ba4e48ea06fa40125d2547b9f25e':
  DO NOT MERGE. Implement connection error dialogs (2/4)
tree: bb01ef5a7c4e96437f3a2dd5ac98c4f3f55c6714
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml