diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-31 12:53:08 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-07-31 12:53:08 -0700 |
| commit | c1729a4d154f28c32175823e0cb9448a9c58a4e4 (patch) | |
| tree | e61b877633207260e2c671b2eec39c42281e1fc0 /src/com/android/launcher3/CellLayout.java | |
| parent | 51e4f0f8eefb6d31227be8f7539c972f09c8db95 (diff) | |
| parent | e5bb705fb79f18df8680958dcf2c5460e16c90b6 (diff) | |
| download | android_packages_apps_Trebuchet-c1729a4d154f28c32175823e0cb9448a9c58a4e4.tar.gz android_packages_apps_Trebuchet-c1729a4d154f28c32175823e0cb9448a9c58a4e4.tar.bz2 android_packages_apps_Trebuchet-c1729a4d154f28c32175823e0cb9448a9c58a4e4.zip | |
resolved conflicts for merge of e5bb705f to ub-launcher3-master
Change-Id: Id7ec170a3c4b1415b18ad46a18d7ea69595a8992
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
0 files changed, 0 insertions, 0 deletions