diff options
| author | Doris Liu <tianliu@google.com> | 2014-06-12 18:12:31 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2014-06-12 18:13:47 -0700 |
| commit | 0f54163a7b0ee554e7083e0108153cbc6c9f32e5 (patch) | |
| tree | b490f6a4b39b8db4031448d861ab9a3b1321fb77 /res/values-cs/strings.xml | |
| parent | 6fbfe5173803b303c883ab2d446f50983cf43c2e (diff) | |
| parent | 2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d (diff) | |
| download | android_packages_apps_Camera2-0f54163a7b0ee554e7083e0108153cbc6c9f32e5.tar.gz android_packages_apps_Camera2-0f54163a7b0ee554e7083e0108153cbc6c9f32e5.tar.bz2 android_packages_apps_Camera2-0f54163a7b0ee554e7083e0108153cbc6c9f32e5.zip | |
resolved conflicts for merge of 2c8ac0ad to ub-camera-glacier
Change-Id: If25e388378acefe505c6bd8fed530eacb0bef6eb
Diffstat (limited to 'res/values-cs/strings.xml')
0 files changed, 0 insertions, 0 deletions