diff options
| author | Arne Coucheron <arco68@gmail.com> | 2016-09-08 01:43:29 +0200 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2016-09-08 01:57:11 +0200 |
| commit | cef0045f3c2fb06543be8cdccf6e42364b997ace (patch) | |
| tree | 94d344a10bd32bc98873dd75ad315a7739cbc6ef /AndroidManifest.xml | |
| parent | f676403bb5603f9d2a25388070903b98a2a75028 (diff) | |
| download | android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.tar.gz android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.tar.bz2 android_packages_apps_Snap-cef0045f3c2fb06543be8cdccf6e42364b997ace.zip | |
camera2: Fix mismerge
Change-Id: Ic367b36a48d9738ca16b193a1576235b1115df19
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions