| commit | 648cba18c52b3a1c72aac87627a0c4cdc597b7b0 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Thu Jun 05 22:35:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 05 22:35:18 2014 +0000 |
| tree | 5607ed0a9d5ee5da3f3436f680ffe1c63f1c96a0 | |
| parent | bb5114fb44215731e1d3a4b08a0a6fd0561c6145 [diff] | |
| parent | 33be20ab81eae293abd978ac41cb1c990d51dc4b [diff] |
am 5287cef5: (-s ours) Merge "DO NOT MERGE. Implement connection error dialogs (4/4)" into lmp-preview-dev * commit '5287cef50ca7f172f69576e048b244ea18474d3c': DO NOT MERGE. Implement connection error dialogs (4/4)