| commit | dbbfc51afd376f24e916523ce174b014edc3d5a5 | [log] [tgz] |
|---|---|---|
| author | Vinod Krishnan <vinodkrishnan@google.com> | Fri May 09 22:26:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 22:26:04 2014 +0000 |
| tree | 4c775c405cd5cf3996ef9567ad82e412818ea940 | |
| parent | 35c35a07d56a7d6b4d12c1b864789fa4cf9c7285 [diff] | |
| parent | 7a1cbe9d4ad4d48db6bfbfa8df7afd5ec3b48b19 [diff] |
am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master" * commit '027017768fb1e75aa1c5e1b4a0344b9a4b12c4e0': Adding a margin for the AlertDialog to work on circular UI.