summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-12-0950-100/+50
* am f9b2d0c7: Remove TRIM supportAlan Newberger2013-12-041-2/+1
|\
| * Remove TRIM supportAlan Newberger2013-12-041-2/+1
* | am be55432c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2013-12-040-0/+0
|\|
| * Import translations. DO NOT MERGEGeoff Mendal2013-12-0455-57/+107
* | Import translations. DO NOT MERGEGeoff Mendal2013-12-0455-57/+107
* | am d75b9aee: Fix samsung video recordingMichael Kolb2013-12-031-1/+11
|\|
| * Fix samsung video recordingMichael Kolb2013-12-031-1/+11
* | am 13350e5e: Fix WB indicator overrideMichael Kolb2013-12-031-3/+6
|\|
| * Fix WB indicator overrideMichael Kolb2013-12-031-3/+6
* | am 0f7d5488: Revert fixed focus area in CAF modeMichael Kolb2013-12-031-15/+7
|\|
| * Revert fixed focus area in CAF modeMichael Kolb2013-12-031-15/+7
* | am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-car...Alan Newberger2013-12-032-3/+4
|\|
| * Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbadAlan Newberger2013-12-032-3/+4
| |\
| | * Add another HTC picture resolutionMichael Kolb2013-12-022-3/+4
* | | am 7993f452: Always set focus mode first before applying scene modeMichael Kolb2013-12-021-0/+4
|\| |
| * | Always set focus mode first before applying scene modeMichael Kolb2013-12-021-0/+4
| |/
* | am 88f9b3e7: Reduce logging of flattened PreferencesSeth Raphael2013-11-271-2/+1
|\|
| * Reduce logging of flattened PreferencesSeth Raphael2013-11-271-2/+1
* | am adf70222: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2013-11-250-0/+0
|\|
| * Import translations. DO NOT MERGEGeoff Mendal2013-11-253-4/+4
* | Import translations. DO NOT MERGEGeoff Mendal2013-11-253-4/+4
* | am 18eb2e4e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-210-0/+0
|\|
| * Import translations. DO NOT MERGEBaligh Uddin2013-11-2155-277/+387
* | Import translations. DO NOT MERGEBaligh Uddin2013-11-201-1/+1
* | am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->o...Andy Huibers2013-11-191-16/+28
|\|
| * Delay onResume tasks to speed up lockscreenAndy Huibers2013-11-191-16/+28
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-181-1/+1
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-11-181-1/+1
* | | am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness.Ruben Brunk2013-11-181-15/+26
|\ \ \ | |/ / |/| / | |/
| * gcam: Clean up placeholders, and add deletion robustness.Ruben Brunk2013-11-181-15/+26
* | am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hid...Sascha Haeberling2013-11-132-17/+14
|\|
| * Merge "Fix issue of focus indicator staying on without being hidden" into gb-...Sascha Haeberling2013-11-142-17/+14
| |\
| | * Fix issue of focus indicator staying on without being hiddenSascha Haeberling2013-11-132-17/+14
* | | am fc7b8341: Ensure view size gets updated after phone decors change.Doris Liu2013-11-131-9/+14
|\| |
| * | Ensure view size gets updated after phone decors change.Doris Liu2013-11-131-9/+14
| |/
* | merge in release branch changes (no-op).Ed Heyl2013-11-130-0/+0
|\ \
| * \ merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-120-0/+0
| |\ \
| | * \ merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-110-0/+0
| | |\ \
| | | * | Add logging to various actionsSeth Raphael2013-11-088-4/+105
| | | * | Ensure mOpenCameraThread has been setup before dereferencing.Ruben Brunk2013-11-081-7/+15
* | | | | am ff3a994a: Merge "Show the 100% state of the progress at least one frame." ...Sascha Haeberling2013-11-132-16/+82
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Show the 100% state of the progress at least one frame." into gb-ub-ph...Sascha Haeberling2013-11-132-16/+82
| |\ \ \ \
| | * | | | Show the 100% state of the progress at least one frame.Sascha Haeberling2013-11-122-16/+82
* | | | | | am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb...Seth Raphael2013-11-134-7/+8
|\| | | | | | |_|/ / / |/| | | |
| * | | | Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-ca...Seth Raphael2013-11-134-7/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add parameters and deduplicate parameter changesSeth Raphael2013-11-124-7/+8
* | | | | am cc70702c: Revert parallel opening camera in photo mode.Erin Dahlgren2013-11-121-167/+65
|\| | | |
| * | | | Revert parallel opening camera in photo mode.Erin Dahlgren2013-11-121-167/+65
| |/ / /
* | | | am a7c84bac: Merge "Close mode menus if another control is touched" into gb-u...Andy Huibers2013-11-123-0/+5
|\| | |