diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-11 17:26:50 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-04-11 17:26:50 -0700 |
| commit | bb3c1f8f7c4331a50e57cf1e243a318d8bc82172 (patch) | |
| tree | d736721f562fa5f56064e445e89574c50144553d /src/com/android/launcher3/compat | |
| parent | 7fc94d7aacddb12e6d50401314fdc029d20939a6 (diff) | |
| parent | ce44516dd869dff1d6a744e26625a662d9567a10 (diff) | |
| download | android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.tar.gz android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.tar.bz2 android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.zip | |
resolve merge conflicts of ce44516dd to ub-launcher3-master
Change-Id: I6f4455c1d4bedf778850acbb1e1c7372d532e13a
Diffstat (limited to 'src/com/android/launcher3/compat')
0 files changed, 0 insertions, 0 deletions