| commit | e45aa8160480850bf1581fe0d9deeb763c0e7bae | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Wed Jul 01 17:13:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:13:40 2015 +0000 |
| tree | 73901e71a3ddfcf186e51b16c22d160c13f46f57 | |
| parent | d8073cce0a8e78515796df3080a8c7d14c2c415b [diff] | |
| parent | cb583bba3133319dd680f65a1f623532c0531fba [diff] |
am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev * commit 'd40c423b1cdccd61ed411b0b9e3fbefd47e99f9c': Calculate outset hint when adding window.