| commit | 3370b6c95e153c3c665e38f6f9b5d105da2949d7 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Mon Jun 08 22:14:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 22:14:38 2015 +0000 |
| tree | 270b211f00022358c66c394fb254de2ea4699a09 | |
| parent | c2fbbcc7976826ca0e12e437dbbdf8702cc2ebf4 [diff] | |
| parent | 5e4c382d15968c757fb9c5783cbd420156ea8ad2 [diff] |
am 5e4c382d: resolved conflicts for merge of 17ba2e6c to mnc-dev * commit '5e4c382d15968c757fb9c5783cbd420156ea8ad2': Calculate outsets before window frame adjustment.