summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryceMichael Kolb2013-05-168-0/+0
| |\ \
| | * | Add new overlay icons for sharpen and curvesMichael Kolb2013-05-168-0/+0
* | | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
|\| | |
| * | | Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
| |\ \ \
| | * | | toUpper() some stringsJohn Reck2013-05-162-2/+4
| | |/ /
* | | / am fef58a0f: change edit iconJohn Hoford2013-05-164-1/+1
|\| | | | |_|/ |/| |
| * | change edit iconJohn Hoford2013-05-164-1/+1
| |/
* | am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
|\|
| * Merge "New count down beeps." into gb-ub-photos-bryceDoris Liu2013-05-132-0/+0
| |\
| | * New count down beeps.Doris Liu2013-05-132-0/+0
* | | am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryceMichael Kolb2013-05-084-0/+1
|\| |
| * | Add drop shadow to preview thumbMichael Kolb2013-05-084-0/+1
| |/
* | Remove new camera activity to avoid build breakageDoris Liu2013-05-085-201/+0
* | am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-0841-121/+101
|\|
| * Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-0841-121/+101
| |\
| | * Fix second level menuMichael Kolb2013-05-0841-121/+101
| * | DO NOT MERGE Further assets clean up.Angus Kong2013-05-0821-299/+0
| |/
* | am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryceMichael Kolb2013-05-07183-0/+0
|\|
| * Remove unused assetsMichael Kolb2013-05-07183-0/+0
* | Quick and Dirty build fixMichael Kolb2013-05-061-0/+57
* | am 08d2c513: Merge "Fix black background on save progress indicator." into gb...George Mount2013-05-061-1/+1
|\|
| * Merge "Fix black background on save progress indicator." into gb-ub-photos-bryceGeorge Mount2013-05-061-1/+1
| |\
| | * Fix black background on save progress indicator.George Mount2013-05-061-1/+1
* | | am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryceMichael Kolb2013-05-064-65/+75
|\| |
| * | Fix lockscreen camera widget layoutMichael Kolb2013-05-064-65/+75
| |/
| * Import translations. DO NOT MERGEBaligh Uddin2013-05-031-1/+1
* | am 00259461: Fix UInicolasroard2013-05-015-8/+12
|\|
| * Fix UInicolasroard2013-05-015-8/+12
* | am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-017-50/+8
|\|
| * Merge "Fix layout and preview for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-017-50/+8
| |\
| | * Fix layout and preview for tabletsMichael Kolb2013-05-017-50/+8
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-012-2/+2
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEBaligh Uddin2013-05-012-2/+2
* | | am c43e5b6b: Update capture animationMichael Kolb2013-05-016-1/+54
|\| |
| * | Update capture animationMichael Kolb2013-05-016-1/+54
* | | am 03e752e0: Update scene mode off icon in menuMichael Kolb2013-05-011-1/+1
|\| |
| * | Update scene mode off icon in menuMichael Kolb2013-05-011-1/+1
| |/
| * Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-303-8/+5
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-04-303-8/+5
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-302-20/+11
| |/
* | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-017-1/+2
|\|
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-297-1/+2
* | am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-292-1/+3
|\|
| * Merge "Cleanup crop activity UI." into gb-ub-photos-bryceRuben Brunk2013-04-292-1/+3
| |\
| | * Cleanup crop activity UI.Ruben Brunk2013-04-262-1/+3
* | | am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-26173-24/+39
|\| |
| * | Merge "Add new indicators" into gb-ub-photos-bryceMichael Kolb2013-04-26173-24/+39
| |\ \
| | * | Add new indicatorsMichael Kolb2013-04-26173-24/+39
| | |/
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-04-2635-373/+102
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-04-2635-373/+102