summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2012-09-2849-1/+197
* am c7e3c76d: Show a placeholder when the camera filmstrip is emptyBobby Georgescu2012-09-288-75/+261
|\
| * Show a placeholder when the camera filmstrip is emptyBobby Georgescu2012-09-288-75/+261
* | am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-archesMangesh Ghiware2012-09-278-46/+147
|\|
| * Merge "Update to sharing panorama" into gb-ub-photos-archesMangesh Ghiware2012-09-278-46/+147
| |\
| | * Update to sharing panoramaMangesh Ghiware2012-09-278-46/+147
* | | am 5a429e56: Merge "Use an actionbar - move the "show original" button to the...nicolasroard2012-09-278-164/+169
|\| |
| * | Merge "Use an actionbar - move the "show original" button to the bottom left ...nicolasroard2012-09-278-164/+169
| |\ \
| | * | Use an actionbarnicolasroard2012-09-278-164/+169
| | |/
* | | am 8473d944: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-09-270-0/+0
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-271-1/+1
* | | Import translations. DO NOT MERGEBaligh Uddin2012-09-275-7/+7
* | | am 624ed9df: Fix up button behavior in camera appBobby Georgescu2012-09-271-1/+5
|\| |
| * | Fix up button behavior in camera appBobby Georgescu2012-09-271-1/+5
| |/
* | am 863b4e65: We weren\'t applying the parameter on an existing filternicolasroard2012-09-271-1/+1
|\|
| * We weren't applying the parameter on an existing filternicolasroard2012-09-271-1/+1
* | am 9579b815: Only apply the parameter to the currently edited filternicolasroard2012-09-274-19/+15
|\|
| * Only apply the parameter to the currently edited filternicolasroard2012-09-274-19/+15
* | am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-archesJohn Reck2012-09-271-1/+3
|\|
| * Merge "Fix Monkey NPE" into gb-ub-photos-archesJohn Reck2012-09-271-1/+3
| |\
| | * Fix Monkey NPEJohn Reck2012-09-271-1/+3
* | | am 02f778af: Remove the pie slider, add a linear slidernicolasroard2012-09-275-192/+183
|\| |
| * | Remove the pie slider, add a linear slidernicolasroard2012-09-275-192/+183
* | | am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photo...Teng-Hui Zhu2012-09-274-59/+57
|\| |
| * | Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-archesTeng-Hui Zhu2012-09-274-59/+57
| |\ \
| | * | Trimming: clean up the UI for trimming.Teng-Hui Zhu2012-09-274-59/+57
| | |/
* | | am f37e1e9a: Add the intent filter to start the new editor Set Gallery to ide...nicolasroard2012-09-271-16/+19
|\| |
| * | Add the intent filter to start the new editornicolasroard2012-09-271-16/+19
| |/
* | am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2012-09-270-0/+0
|\|
| * Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-09-273-5/+5
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2012-09-263-5/+5
* | | am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-p...Teng-Hui Zhu2012-09-274-16/+17
|\| |
| * | Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-archesTeng-Hui Zhu2012-09-274-16/+17
| |\ \
| | * | Trimming: switch to use sherlock action barTeng-Hui Zhu2012-09-264-16/+17
* | | | am 743f8152: Several secure album changes.Wu-cheng Li2012-09-278-4/+13
|\| | |
| * | | Several secure album changes.Wu-cheng Li2012-09-278-4/+13
* | | | am 4419f551: Merge "Don\'t set treat back as up if there is no parent album."...Owen Lin2012-09-261-9/+12
|\| | |
| * | | Merge "Don't set treat back as up if there is no parent album." into gb-ub-ph...Owen Lin2012-09-261-9/+12
| |\ \ \
| | * | | Don't set treat back as up if there is no parent album.Owen Lin2012-09-261-9/+12
* | | | | am b904ecba: Merge "Show unlock image in secure album only when camera roll h...Wu-cheng Li2012-09-261-2/+20
|\| | | |
| * | | | Merge "Show unlock image in secure album only when camera roll has items." in...Wu-cheng Li2012-09-261-2/+20
| |\ \ \ \
| | * | | | Show unlock image in secure album only when camera roll has items.Wu-cheng Li2012-09-261-2/+20
* | | | | | am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-u...Wu-cheng Li2012-09-261-0/+6
|\| | | | |
| * | | | | Merge "Fix background replacement crash in camcorder." into gb-ub-photos-archesWu-cheng Li2012-09-261-0/+6
| |\ \ \ \ \
| | * | | | | Fix background replacement crash in camcorder.Wu-cheng Li2012-09-271-0/+6
* | | | | | | am e3f9f579: Load the correct library...nicolasroard2012-09-261-1/+1
|\| | | | | |
| * | | | | | Load the correct library...nicolasroard2012-09-261-1/+1
| |/ / / / /
* | | | | | am 69d781ad: Fix the buildnicolasroard2012-09-261-2/+3
|\| | | | |
| * | | | | Fix the buildnicolasroard2012-09-261-2/+3
| | |_|/ / | |/| | |
* | | | | am 2ce4bec8: Only create debugTag if necessaryJohn Reck2012-09-261-5/+8
|\| | | |