summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-0845-279/+203
|\
| * Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-0845-279/+203
| |\
| | * Fix second level menuMichael Kolb2013-05-0845-279/+203
* | | am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-...Angus Kong2013-05-080-0/+0
|\| |
| * | Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryceAngus Kong2013-05-0821-299/+0
| |\ \
| | * | DO NOT MERGE Further assets clean up.Angus Kong2013-05-0821-299/+0
| | |/
* | | am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-phot...Bobby Georgescu2013-05-081-0/+2
|\| |
| * | Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryceBobby Georgescu2013-05-081-0/+2
| |\ \ | | |/ | |/|
| | * Fix memory leak in SparseArrayBitmapPoolBobby Georgescu2013-05-071-0/+2
* | | Fix buildMichael Kolb2013-05-071-0/+5
* | | Merge "Fix build" into gb-ub-photos-carlsbadMichael Kolb2013-05-081-12/+0
|\ \ \
| * | | Fix buildMichael Kolb2013-05-071-12/+0
* | | | am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-...Doris Liu2013-05-074-2/+14
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryceDoris Liu2013-05-084-2/+14
| |\ \
| | * | Fix video capture intent overlapping buttonsDoris Liu2013-05-074-2/+14
* | | | am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryceMichael Kolb2013-05-071-1/+47
|\| | |
| * | | Merge "Add animation to slice selection" into gb-ub-photos-bryceMichael Kolb2013-05-081-1/+47
| |\ \ \
| | * | | Add animation to slice selectionMichael Kolb2013-05-071-1/+47
| | |/ /
* | | | 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-072-4/+28
|\| |
| * | Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-phot...Sascha Haeberling2013-05-072-3/+27
| |\ \ | | |/ | |/|
| | * Avoid rounding errors from cropping uncropped images.Sascha Haeberling2013-05-072-3/+27
* | | am 48ce39b8: Fix review button placementMichael Kolb2013-05-071-53/+66
|\| |
| * | Fix review button placementMichael Kolb2013-05-071-53/+66
* | | am ed1224f1: Resize children to avoid laying out outside parentDoris Liu2013-05-071-16/+32
|\| |
| * | Resize children to avoid laying out outside parentDoris Liu2013-05-061-16/+32
| |/
* | 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
|\| |
| * | 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
* | | | am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryceDoris Liu2013-05-062-7/+20
|\| | |
| * | | Merge "Restrict checking for device flip" into gb-ub-photos-bryceDoris Liu2013-05-062-7/+20
| |\ \ \ | | |/ / | |/| |
| | * | Restrict checking for device flipDoris Liu2013-05-032-7/+20
* | | | am 1e3bc7d4: Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
|\| | |
| * | | Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
| | |/ | |/|
* | | am 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-p...Baligh Uddin2013-05-040-0/+0
|\| |
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-041-1/+1
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-05-031-1/+1
* | | | am cd0fb7af: Fix NPE caused by insets never being setDoris Liu2013-05-031-6/+8
|\| | |
| * | | Fix NPE caused by insets never being setDoris Liu2013-05-031-6/+8
| | |/ | |/|
* | | am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-p...Doris Liu2013-05-033-68/+127
|\| |
| * | Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryceDoris Liu2013-05-033-68/+127
| |\ \
| | * | Anchor camera controls when flipping deviceDoris Liu2013-05-033-68/+127
| | |/
* | | am b0a1e9fe: Don\'t show settings when popup is shown.Angus Kong2013-05-031-0/+1
|\| |
| * | Don't show settings when popup is shown.Angus Kong2013-05-021-0/+1
| |/