summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge \\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\" am: 02301d...Chih-Hung Hsieh2016-07-262-18/+18
|\
| * Merge \\"Fix misc-macro-parentheses warnings in LegacyCamera.\\" am: 02301db045Chih-hung Hsieh2016-07-262-18/+18
| |\
| | * Merge \"Fix misc-macro-parentheses warnings in LegacyCamera.\"Chih-Hung Hsieh2016-07-262-18/+18
| | |\ | |/ /
| | * Merge "Fix misc-macro-parentheses warnings in LegacyCamera."Chih-hung Hsieh2016-07-262-18/+18
| | |\
| | | * Fix misc-macro-parentheses warnings in LegacyCamera.Chih-Hung Hsieh2016-06-292-18/+18
| | |/
* | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20Chih-Hung Hsieh2016-05-241-1/+1
|\ \ \ | |/ /
| * | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69Chih-Hung Hsieh2016-05-241-1/+1
| |\ \
| | * \ Merge "Fix misc-macro-parentheses warnings."Chih-Hung Hsieh2016-05-241-1/+1
| | |\ \ | | | |/
| | | * Merge "Fix misc-macro-parentheses warnings."Treehugger Robot2016-05-241-1/+1
| | | |\ | | |/ /
| | | * Fix misc-macro-parentheses warnings.Chih-Hung Hsieh2016-05-121-1/+1
| | |/
* | | Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4Lingfeng Yang2016-05-031-2/+15
|\ \ \ | |/ / | | / | |/ |/|
| * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-05-031-2/+15
| |\ |/ /
| * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-04-271-2/+15
|/
* 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 in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| |\
* | \ Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | |/ / |/| / | |/
| * Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
* | Fix camera_control distorted in small resolution.akahuang2012-06-153-4/+10
* | Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
|/
* Fix NPE when only front cameras are available.Angus Kong2012-06-134-26/+9
* Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala2012-06-047-22/+22
* Fix the share popup. DO NOT MERGEAngus Kong2012-02-184-38/+9
* Import translations. DO NOT MERGEEric Fischer2012-02-088-50/+67
* Merge "Do not allow switching to other activities during panorama capture. (d...Wei Huang2012-01-201-0/+15
|\
| * Do not allow switching to other activities during panorama capture. (do not m...Wu-cheng Li2012-01-201-0/+15
* | Allow saving panorama after the activity is paused. (do not merge)Angus Kong2012-01-123-34/+75
|/
* Use default volume control stream instead of the music stream.Eino-Ville Talvala2012-01-051-2/+0
* Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-12-062-3/+3
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-12-062-3/+3
* | Fix crash after restoring defaults.Wu-cheng Li2011-12-061-0/+3
|/