summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-...Doris Liu2013-10-111-1/+1
|\
| * Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbadDoris Liu2013-10-121-1/+1
| |\
| | * Bring full screen window flag back to cameraDoris Liu2013-10-111-1/+1
* | | am c13cc22b: Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
|\| |
| * | Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
| |/
* | Fix build break.Sameer Padala2013-10-1149-4609/+3
* | Revert "Revert "Import translations. DO NOT MERGE""Baligh Uddin2013-10-1155-179/+179
* | Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-1155-179/+179
* | Import translations. DO NOT MERGEBaligh Uddin2013-10-1155-179/+179
* | am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbadMindy Pereira2013-10-1020-0/+0
|\|
| * Update shutter recording assets.Mindy Pereira2013-10-0920-0/+0
* | am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" int...Doris Liu2013-10-091-0/+1
|\|
| * Workaround to disable swiping for SRI during captureDoris Liu2013-10-091-0/+1
* | am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photo...Mindy DelliCarpini2013-10-0852-0/+0
|\|
| * Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbadMindy DelliCarpini2013-10-0852-0/+0
| |\
| | * Update camera assets for de-blue effortMindy DelliCarpini2013-10-0452-0/+0
* | | Merge "Revert "Import translations. DO NOT MERGE"" into klp-devBaligh Uddin2013-10-0855-179/+179
|\ \ \
| * | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-0855-179/+179
* | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0855-179/+179
|\| | |
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0755-179/+179
* | | | am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbadSascha Haeberling2013-10-071-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Increase character limit.Sascha Haeberling2013-10-071-4/+4
| * | Fix missing filtershow string. DO NOT MERGESascha Haeberling2013-10-0749-4608/+3
| |/
* | Revert "Remove translated filtershow_strings.xml files."Baligh Uddin2013-10-0750-0/+4672
* | Remove translated filtershow_strings.xml files.Baligh Uddin2013-10-0450-4672/+0
* | Merge "Build broken." into klp-devBaligh Uddin2013-10-0555-253/+179
|\ \
| * | Build broken.Baligh Uddin2013-10-0555-253/+179
* | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0555-179/+253
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-10-0455-179/+253
* | | am 18709218: Update the HDR+ assets.Sascha Haeberling2013-10-0420-0/+0
|\ \ \ | |/ / |/| / | |/
| * Update the HDR+ assets.Sascha Haeberling2013-10-0420-0/+0
* | am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-pho...Erin Dahlgren2013-10-031-1/+0
|\|
| * Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbadErin Dahlgren2013-10-031-1/+0
| |\
| | * Make space for photosphere rendering textErin Dahlgren2013-10-031-1/+0
* | | am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-p...Sascha Haeberling2013-10-0328-15/+15
|\| |
| * | Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-0328-15/+15
* | | am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-phot...Kevin Gabayan2013-10-035-0/+0
|\| |
| * | Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbadKevin Gabayan2013-10-035-0/+0
| |\ \
| | * | Camera2 icon update for all resolutions.Kevin Gabayan2013-10-025-0/+0
* | | | am 623b74b6: Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-033-7/+5
|\| | |
| * | | Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-033-7/+5
* | | | am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
|\| | |
| * | | Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
| |\ \ \
| | * | | Add missing crop message.Sascha Haeberling2013-10-031-1/+2
| | |/ /
* | | | am 9ac97492: Merge "Show the delete button if there is room in action bar." i...ztenghui2013-10-031-1/+1
|\| | |
| * | | Merge "Show the delete button if there is room in action bar." into gb-ub-pho...ztenghui2013-10-031-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Show the delete button if there is room in action bar.ztenghui2013-10-021-1/+1
| | |/
* | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0355-152/+207
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0255-152/+207
* | | | am c60e2b09: Merge "Increase char limit for camera timer sound message." into...Sascha Haeberling2013-10-021-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /