diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-09-14 16:35:22 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-09-26 04:11:41 -0700 |
| commit | ca9e7e7da8d2e5fc10115508a92a1fcc24c37815 (patch) | |
| tree | fb47c03378fc4ee4e991999965dcab54f02554b6 /AndroidManifest.xml | |
| parent | fb658754c731169b5198c252eed0d62b9fcce4a8 (diff) | |
| download | android_packages_apps_Gallery2-ca9e7e7da8d2e5fc10115508a92a1fcc24c37815.tar.gz android_packages_apps_Gallery2-ca9e7e7da8d2e5fc10115508a92a1fcc24c37815.tar.bz2 android_packages_apps_Gallery2-ca9e7e7da8d2e5fc10115508a92a1fcc24c37815.zip | |
Fix merge issue
Change-Id: I63badbc4de44f630e72ed4f5da6c3546ade7135d
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions