summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r3' into replicant-6.0Wolfgang Wiedmeyer2015-12-187-597/+3
|\
| * am 33e28809: Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
| |\
| | * Merge "Add missing <string.h> include."Elliott Hughes2015-01-261-0/+2
| | |\
| | | * Add missing <string.h> include.Elliott Hughes2015-01-261-0/+2
| | |/
| * | am e48f3382: Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
| |\ \ | | |/
| | * Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
| | |\
| | | * Use and older standard version.Dan Albert2014-11-201-0/+1
| | |/
| * | am 090283cf: (-s ours) Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-210-0/+0
| |\ \ | | |/
| | * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-191-199/+0
| * | Remove deprecated localesBaligh Uddin2014-07-171-199/+0
| |/
| * am d9b5d894: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-210-0/+0
| |\
| | * Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-181-2/+0
| | |\
| | | * Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-181-2/+0
| | |/
| * | Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-171-2/+0
| * | am 8e944e63: Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| |\ \ | | |/
| | * Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| | |\
| | | * Loading the corresponding library in LegacyCamera appJun Tian2013-08-061-1/+1
| * | | am be2086de: Merge "Fix the loading library issue of panorama mode in Legacyc...Glenn Kasten2014-01-071-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix the loading library issue of panorama mode in Legacycamera app"Glenn Kasten2014-01-071-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fix the loading library issue of panorama mode in Legacycamera appJun Tian2013-07-041-1/+1
| | |/
| * | Remove deprecated localesBaligh Uddin2013-12-093-396/+0
| |/
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\
* | \ Merge remote-tracking branch 'cyanogenmod/cm-11.0' into replicant-6.0Wolfgang Wiedmeyer2015-12-180-0/+0
|\ \ \
| * \ \ Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-250-0/+0
| |\ \ \ | | |/ /
| | * | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\ \
* | | | | make Camera work on lock screen (secure mode)Wolfgang Wiedmeyer2015-10-094-3/+86
* | | | | LegacyCamera: CA translationsarnau2013-08-251-0/+38
|/ / / /
* | | | LegacyCamera: PT-BR update translationsGustavo2013-07-061-0/+37
* | | | Merge "LegacyCamera: Load correct panorama JNI libs" into cm-10.1Danny Baumann2013-05-302-2/+2
|\ \ \ \
| * | | | LegacyCamera: Load correct panorama JNI libsKonsta Tuomio2012-12-152-2/+2
* | | | | LegacyCamera: German translationjackmu952013-05-281-0/+37
* | | | | LegacyCamera: DA translationJacob Overgaard Madsen2013-05-161-0/+37
* | | | | LegacyCamera: NB translationOdin Ugedal2013-05-111-0/+37
* | | | | LegacyCamera: Add missing AF translationsisimobile2013-05-071-0/+38
* | | | | LegacyCamera : refactor in cm_strings.xmlDelPETER2013-04-307-42/+52
* | | | | LegacyCamera: HU translation refactoringTamás Tóth2013-04-291-0/+37
* | | | | LegacyCamera: Update italian translationrheeze2013-04-281-0/+37
* | | | | LegacyCamera : FR translationDelPETER2013-04-272-23/+37
* | | | | Merge "LegacyCamera: NL translations" into cm-10.1Marco Brohet2013-04-241-0/+37
|\ \ \ \ \
| * | | | | LegacyCamera: NL translationsMarco Brohet2013-04-231-0/+37
* | | | | | Merge "LegacyCamera: ES translations" into cm-10.1Marco Brohet2013-04-242-25/+38
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | LegacyCamera: ES translationsdjMesias2013-04-212-25/+38
* | | | | | LegacyCamera: Refactor default translationsMarco Brohet2013-04-232-23/+41
|/ / / / /
* | | | | Merge "LegacyCamera : add french translation" into cm-10.1Marco Brohet2013-04-121-5/+28
|\ \ \ \ \
| * | | | | LegacyCamera : add french translationDelPETER2013-04-061-5/+28
* | | | | | Merge "LegacyCamera: Reorganize Greek translations" into cm-10.1Marco Brohet2013-04-122-31/+48
|\ \ \ \ \ \
| * | | | | | LegacyCamera: Reorganize Greek translationsMichael Bestas2013-04-082-31/+48
| |/ / / / /
* | | | | | LegacyCamera: ES translationsdjMesias2013-04-121-0/+25
|/ / / / /
* | | | | LegacyCamera: Fix build errorMichael Bestas2013-03-012-3/+1
* | | | | LegacyCamera: Update Greek translationsMichael Bestas2013-02-091-12/+32