summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac...mr1.1-stagingSteve Kondik2013-02-1228-173/+306
|\
| * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-180-0/+0
| |\
| | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-100-0/+0
| | |\
| | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-050-0/+0
| | | |\
| | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-040-0/+0
| | | | |\
| | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-290-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-190-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-160-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | | | | | | | | |\
| * | | | | | | | | \ am 5b188c94: Disabled further filters after Tiny Planet.Ruben Brunk2012-12-182-1/+36
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Disabled further filters after Tiny Planet.Ruben Brunk2012-12-172-1/+36
| * | | | | | | | | | am 695e1aa0: Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
| |\| | | | | | | | | | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
| * | | | | | | | | am db99a10b: Fix NPE in PhotoPageBobby Georgescu2012-12-051-1/+3
| |\| | | | | | | | | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix NPE in PhotoPageBobby Georgescu2012-12-041-1/+3
| * | | | | | | | am 870e62ac: Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
| |\| | | | | | |
| | * | | | | | | Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
| * | | | | | | | am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-archesMichael Kolb2012-12-041-1/+3
| |\| | | | | | |
| | * | | | | | | Merge "Prevent Camera UI in Gallery" into gb-ub-photos-archesMichael Kolb2012-12-041-1/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Prevent Camera UI in GalleryMichael Kolb2012-12-041-1/+3
| * | | | | | | | | am c6fe9f7d: Remove unneeded border assetnicolasroard2012-12-041-0/+0
| |\| | | | | | | |
| | * | | | | | | | Remove unneeded border assetnicolasroard2012-12-041-0/+0
| | |/ / / / / / /
| * | / / / / / / am 04df59eb: Merge "Change themes" into gb-ub-photos-archesYour Name2012-12-032-1/+3
| |\| | | | | | | | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge "Change themes" into gb-ub-photos-archesYour Name2012-12-032-1/+3
| | |\ \ \ \ \ \
| | | * | | | | | Change themesYour Name2012-12-032-1/+3
| * | | | | | | | am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align hist...nicolasroard2012-11-292-7/+12
| |\| | | | | | |
| | * | | | | | | (re-)add vertical/horizontal lines when moving Curvesnicolasroard2012-11-292-7/+12
| * | | | | | | | am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
| |\| | | | | | |
| | * | | | | | | Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added dashed diagonal for crop.Ruben Brunk2012-11-283-7/+62
| * | | | | | | | | am 39d46790: Fix transparency issue under the spinner.nicolasroard2012-11-281-1/+2
| |\| | | | | | | |
| | * | | | | | | | Fix transparency issue under the spinner.nicolasroard2012-11-281-1/+2
| * | | | | | | | | am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)nicolasroard2012-11-282-0/+6
| |\| | | | | | | |
| | * | | | | | | | Fix potential crashnicolasroard2012-11-282-0/+6
| | |/ / / / / / /
| * | | | | | | | am 6d867ce0: Set crop ratio to unconstrained by default.nicolasroard2012-11-283-4/+3
| |\| | | | | | |
| | * | | | | | | Set crop ratio to unconstrained by default.nicolasroard2012-11-283-4/+3
| * | | | | | | | am 205d0cdf: Fix overdraw the correct way...nicolasroard2012-11-282-4/+2
| |\| | | | | | |
| | * | | | | | | Fix overdraw the correct way...nicolasroard2012-11-282-4/+2
| * | | | | | | | am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
| |\| | | | | | |
| | * | | | | | | Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix flashing in geometry panelnicolasroard2012-11-282-2/+5
| * | | | | | | | | am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-ar...nicolasroard2012-11-282-1/+5
| |\| | | | | | | |
| | * | | | | | | | Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-archesnicolasroard2012-11-282-1/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix overdraw in FilterShow activitynicolasroard2012-11-282-1/+5
| | | |/ / / / / / /
| * | | | | | | | | am 3507b925: Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-284-1/+11
| |\| | | | | | | |
| | * | | | | | | | Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-284-1/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add new borders assetsnicolasroard2012-11-284-1/+11
| | | |/ / / / / / /
| * | | | | | | | | am cd84d676: Fix history panel overlapnicolasroard2012-11-281-0/+4
| |\| | | | | | | |
| | * | | | | | | | Fix history panel overlapnicolasroard2012-11-281-0/+4
| | |/ / / / / / /