| commit | a58405ef46d5f7ea563605697c2a4792fc11bd17 | [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 | cecfee9f0fff6a7373d3c449cb3d0184589b7143 | |
| parent | cd306b4ca74e3907b19ff3925dc19fbd22dbcccc [diff] | |
| parent | 07bb4c3063f0ffd32785726ea1c4a485b6155cf0 [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.