tree 12ea7f24b0ec0a9f25e1bea1934a683befce6ee6
parent 63c8b6c3257219c97abdbd0bdea0b71030091c06
parent f73b23e7a1ad84d1ef36ddbb83f84beaaf6b1e0d
author Ihab Awad <ihab@google.com> 1401975959 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401975959 +0000

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

* commit '4c0c5cf919dac4708f631a29d7e7537b316e970f':
  DO NOT MERGE. Implement connection error dialogs (1/4)