| commit | 87f6a3d05274d4190d6663ae1099a78a82131aa2 | [log] [tgz] |
|---|---|---|
| author | Michael Kolb <kolby@google.com> | Tue Apr 01 21:15:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 21:15:09 2014 +0000 |
| tree | c83d85c15c41c7743220ec13794cf2edbd05edee | |
| parent | fd2e620baf769564d9b2873103de7f60a39f95ea [diff] | |
| parent | 7fbde1e83703f800c98c1ef7c543f3146cfa43ef [diff] |
am 7fbde1e8: resolved conflict for merge of 2c73e08d to master * commit '7fbde1e83703f800c98c1ef7c543f3146cfa43ef': Add outset to decor view measuring