summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-3129-58/+29
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-05-2929-58/+29
* | | | Improve gesture handlingDoris Liu2013-05-313-175/+73
* | | | Mirroring google3 for CL 47368174.Ruben Brunk2013-05-301-0/+5
* | | | am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
|\| | |
| * | | Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Add HTC One picture resolutionsMichael Kolb2013-05-302-0/+8
* | | | am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-05-290-0/+0
|\| | | | |_|/ |/| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-05-2749-0/+79
| |/
* | Cleaning up ImageShow.Ruben Brunk2013-05-292-59/+49
* | Add UI for insertion in FilmStripView.Angus Kong2013-05-281-0/+1
* | Merge "functionality added to transport filter parameter values to following ...Christian Wichner2013-05-271-0/+24
|\ \
| * | functionality added to transport filter parameter values to following filters...Christian Wichner2013-05-241-0/+24
* | | am 461e101f: Add 13MP resolutionMichael Kolb2013-05-242-0/+4
|\ \ \ | |/ / |/| / | |/
| * Add 13MP resolutionMichael Kolb2013-05-242-0/+4
* | Merge "Make preview size smaller so that low-res images come in faster." into...George Mount2013-05-211-1/+1
|\ \
| * | Make preview size smaller so that low-res images come in faster.George Mount2013-05-211-1/+1
* | | am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-05-170-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-171-6/+6
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-05-171-6/+6
* | | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
|\| | |
| * | | Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
| |/ /
* | | Merge "Add new camera activity back and fix build errors" into gb-ub-photos-c...Doris Liu2013-05-165-0/+502
|\ \ \ | |_|/ |/| |
| * | Add new camera activity back and fix build errorsDoris Liu2013-05-165-0/+502
* | | am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-...Michael Kolb2013-05-168-0/+0
|\ \ \ | | |/ | |/|
| * | 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
* | | resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbadztenghui2013-05-091-3/+8
|\| |
| * | Merge "Fix the verbose log" into gb-ub-photos-bryceztenghui2013-05-091-3/+8
| |\ \
| | * | Fix the verbose logztenghui2013-05-081-3/+8
* | | | 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-086-559/+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
* | | am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-...Angus Kong2013-05-080-0/+0
|\| |
| * | 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
|\|
| * Merge "Remove unused assets" into gb-ub-photos-bryceMichael Kolb2013-05-08183-0/+0
| |\
| | * Remove unused assetsMichael Kolb2013-05-07183-0/+0
* | | am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." in...Sascha Haeberling2013-05-071-1/+1
|\| |