diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-10 12:26:23 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-10 12:27:51 -0800 |
| commit | 7c50b31f57e3e3ec1f433d243afe05554dcaf977 (patch) | |
| tree | b244d7b5cf1d0c7e753fb3f6751c4108cd87d0a5 /AndroidManifest.xml | |
| parent | 323117ca37483c2adcd14b9969e2a36ea57a9d6a (diff) | |
| parent | 3826bab27ef3e7608aba112bd0f5ce2e7c3eac5b (diff) | |
| download | android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.tar.gz android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.tar.bz2 android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.zip | |
resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.
Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions