| commit | 4adeda17f05af1ce252fae214a349dd965544d6b | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Fri Jul 03 05:37:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 03 05:37:25 2015 +0000 |
| tree | da3ef725bdaab19c0d58ec6af4f28d34ebd295bc | |
| parent | ccc8c287ad87ce6b2a35aec40f5009291a300b25 [diff] | |
| parent | e45aa8160480850bf1581fe0d9deeb763c0e7bae [diff] |
am 2b5a6842: am cc7fa77e: am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev * commit '2b5a6842fdbb70c153bb691e86ce3fd0ac07ae60': Calculate outset hint when adding window.