diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-08-28 18:39:24 -0400 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-08-29 20:10:22 -0400 |
| commit | fe8a39d8b0750a332787abbe1a210fb55e444223 (patch) | |
| tree | a9d1545741c85b136de6d336ae708d000a935597 /src/com/android/launcher3/graphics/IconShapeOverride.java | |
| parent | dff92fe1aa90dfad1cce228ee140a70ab7a365b2 (diff) | |
| download | android_packages_apps_Trebuchet-fe8a39d8b0750a332787abbe1a210fb55e444223.tar.gz android_packages_apps_Trebuchet-fe8a39d8b0750a332787abbe1a210fb55e444223.tar.bz2 android_packages_apps_Trebuchet-fe8a39d8b0750a332787abbe1a210fb55e444223.zip | |
Ensure no diffs b/w oc-mr1-dev and ub-launcher3-dorval-polish2.
This should ensure that all future code drops will be able to
merge cleanly.
Bug: 64937210
Test: Manual test
Change-Id: I4f7952d0e979402e120b29dc501ac7fff3de2879
Diffstat (limited to 'src/com/android/launcher3/graphics/IconShapeOverride.java')
0 files changed, 0 insertions, 0 deletions