diff options
| author | Michael Kolb <kolby@google.com> | 2014-04-01 21:15:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 21:15:09 +0000 |
| commit | 87f6a3d05274d4190d6663ae1099a78a82131aa2 (patch) | |
| tree | c83d85c15c41c7743220ec13794cf2edbd05edee /telecomm | |
| parent | fd2e620baf769564d9b2873103de7f60a39f95ea (diff) | |
| parent | 7fbde1e83703f800c98c1ef7c543f3146cfa43ef (diff) | |
| download | frameworks_base-87f6a3d05274d4190d6663ae1099a78a82131aa2.zip frameworks_base-87f6a3d05274d4190d6663ae1099a78a82131aa2.tar.gz frameworks_base-87f6a3d05274d4190d6663ae1099a78a82131aa2.tar.bz2 | |
am 7fbde1e8: resolved conflict for merge of 2c73e08d to master
* commit '7fbde1e83703f800c98c1ef7c543f3146cfa43ef':
Add outset to decor view measuring
Diffstat (limited to 'telecomm')
0 files changed, 0 insertions, 0 deletions