summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix 5514199: Update assets.Chih-Chung Chang2011-10-27150-4/+4
* Merge "Make Panorama work in portrait layout." into ics-mr1Wu-cheng Li2011-10-265-45/+142
|\
| * Make Panorama work in portrait layout.Wei-Ta Chen2011-10-265-45/+142
* | Merge "Fix camera app still opens the camera in lock screen sometimes." into ...Wu-cheng Li2011-10-261-3/+14
|\ \
| * | Fix camera app still opens the camera in lock screen sometimes.Wu-cheng Li2011-10-261-3/+14
* | | Merge "Fix 5489985: Handle the exception when the external volume has not bee...Chih-Chung Chang2011-10-261-4/+10
|\ \ \ | |_|/ |/| |
| * | Fix 5489985: Handle the exception when the external volume has not been added...Chih-Chung Chang2011-10-261-4/+10
| |/
* | am c8b09ebb: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-261-2/+2
* | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2647-1368/+1328
|\ \ \
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2647-1368/+1328
| | |/ | |/|
* | | Add portrait support to effects pipeline in VideoCamera.Eino-Ville Talvala2011-10-262-1/+23
|/ /
* | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-255-28/+62
|\ \ | |/
| * Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-241-2/+2
| |\
| | * Import revised translations. DO NOT MERGEEric Fischer2011-10-241-2/+2
| * | Merge "Add missing state check in EffectsRecorder startup path." into ics-mr0Eino-Ville Talvala2011-10-241-2/+13
| |\ \ | | |/ | |/|
| | * Add missing state check in EffectsRecorder startup path.Eino-Ville Talvala2011-10-241-2/+13
| * | Merge "Fix video thumbnail is not displayed when intent passes the fd." into ...Wei Huang2011-10-242-22/+45
| |\ \
| | * | Fix video thumbnail is not displayed when intent passes the fd.Wu-cheng Li2011-10-242-22/+45
| | |/
| * | Fix startFaceDetection RuntimeException.Wu-cheng Li2011-10-241-2/+2
| |/
* | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \
| * \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| | |\
| | | * merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| | | |\
* | | | \ am 37eac597: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-210-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-211-2/+2
| |/ / /
* | | | Merge "String scrub to bring to punc, wording, etc standards. Bugs: 5165745, ...Claudia de Veaux2011-10-211-27/+27
|\ \ \ \
| * | | | String scrub to bring to punc, wording, etc standards.Claudia de Veaux2011-10-201-27/+27
* | | | | am 74f4ae76: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-10-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-211-2/+2
| |\ \ \ \
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-201-2/+2
| | | |/ / | | |/| |
* | | | | am 048edf2e: Fix focus area in front camera.Chih-yu Huang2011-10-215-43/+44
|\ \ \ \ \ | |/ / / /
| * | | | Fix focus area in front camera.Chih-yu Huang2011-10-215-43/+44
* | | | | am 7d9eadd0: Fix 5491362: don\'t open the camera in onResume in lockscreen.Jim Miller2011-10-215-15/+62
|\ \ \ \ \ | |/ / / /
| * | | | Fix 5491362: don't open the camera in onResume in lockscreen.Jim Miller2011-10-215-15/+62
* | | | | am cfc9bcc6: Fix race condition in preview startup.Eino-Ville Talvala2011-10-201-8/+20
|\ \ \ \ \ | |/ / / /
| * | | | Fix race condition in preview startup.Eino-Ville Talvala2011-10-201-8/+20
* | | | | am 74ec1a36: Merge "Effects: shut down camera preview when unexpected graph c...Eino-Ville Talvala2011-10-201-4/+17
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge "Effects: shut down camera preview when unexpected graph closures occur...Eino-Ville Talvala2011-10-201-4/+17
| |\ \ \ | | |/ / | |/| |
| | * | Effects: shut down camera preview when unexpected graph closures occur.Eino-Ville Talvala2011-10-201-4/+17
* | | | am 4f6e6026: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-10-200-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-2015-106/+66
| |\ \ \ | | |/ / | |/| |
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-10-2015-106/+66
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-200-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| |\ \ \
| | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-190-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am 7b9a10fe: Merge "Fix effects orientation handling." into ics-mr0Eino-Ville Talvala2011-10-202-10/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Fix effects orientation handling." into ics-mr0Eino-Ville Talvala2011-10-202-10/+9
| |\ \ \ \
| | * | | | Fix effects orientation handling.Eino-Ville Talvala2011-10-202-10/+9
| | | |/ / | | |/| |
* | | | | am 71d40934: Merge "Fix camera app crash when failed open the camera." into i...Wu-cheng Li2011-10-201-2/+4
|\ \ \ \ \ | |/ / / /