summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bBrint E. Kriebel2014-09-0976-961/+282
|\
| * Automatic translation importMichael Bestas2014-09-0976-961/+282
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-09-02144-371/+561
|\|
| * Camera2: remove the pause button when timelapse is onKerong Sui2014-09-021-1/+3
| * Camera: Fix beauty mode & slow shutter indicatorSteve Kondik2014-09-032-1/+13
| * Adapt keyguard widget to new button margins.Danny Baumann2014-09-022-6/+6
| * Automatic translation importMichael Bestas2014-09-011-109/+97
| * Camera: Cleanup qcom stringsMichael Bestas2014-08-314-82/+19
| * Camera: Remove unused CM stringsMichael Bestas2014-08-311-2/+0
| * Merge "Fix menu button margins." into cm-11.0Danny Baumann2014-08-282-6/+10
| |\
| | * Fix menu button margins.Danny Baumann2014-08-262-6/+10
| * | Camera: Fix filtering of unsupported camcorder color effectsMichael Bestas2014-08-261-0/+6
| |/
| * Automatic translation importMichael Bestas2014-08-23124-137/+162
| * Automatic translation importMichael Bestas2014-08-096-25/+164
| * Camera2 : Make navigation bar and status bar transparentDanny Baumann2014-08-048-11/+90
| * Automatic translation importMichael Bestas2014-08-012-4/+4
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-07-2718-124/+1181
|\|
| * Automatic translation importMichael Bestas2014-07-2412-113/+848
| * Automatic translation importMichael Bestas2014-07-117-11/+333
* | Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aBrint E. Kriebel2014-06-30109-203/+1404
|\|
| * Automatic translation importMichael Bestas2014-06-302-0/+271
| * Camera2: LT translationsFrant1c2014-06-301-6/+6
| * Automatic translation importMichael Bestas2014-06-295-1/+43
| * Automatic translation importMichael Bestas2014-06-222-0/+80
| * Automatic translation importMichael Bestas2014-06-219-2/+328
| * Automatic translation importMichael Bestas2014-06-1232-49/+416
| * Camera2: Fix AOSP mismergeMichael Bestas2014-06-0959-75/+78
| * Merge tag 'android-4.4.3_r1.1' into HEADRicardo Cerqueira2014-06-0411-30/+34
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-02-201-2/+2
| | * Import translations. DO NOT MERGEBaligh Uddin2013-12-162-3/+3
| | * 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
| | |\|