summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge "Remove mContext varaibles in Views."Chung-yih Wang2011-09-306-15/+9
|\ \ \ \
| * | | | Remove mContext varaibles in Views.Chung-yih Wang2011-09-306-15/+9
* | | | | Merge "Fix the single popup issue."Chung-yih Wang2011-09-307-18/+119
|\ \ \ \ \
| * | | | | Fix the single popup issue.Chung-yih Wang2011-09-307-18/+119
| |/ / / /
* | | | | Merge "Reset zoom UI in onResume."Wu-cheng Li2011-09-304-16/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reset zoom UI in onResume.Wu-cheng Li2011-09-304-16/+22
| | |_|/ | |/| |
* | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-290-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-280-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-280-0/+0
| | |\
| | | * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-270-0/+0
| | | |\
* | | | \ Merge "Fix ModePicker selection UI."Chung-yih Wang2011-09-293-29/+28
|\ \ \ \ \
| * | | | | Fix ModePicker selection UI.Chung-yih Wang2011-09-293-29/+28
* | | | | | Merge "Add dimension attributes to MediaStore."Angus Kong2011-09-294-10/+17
|\ \ \ \ \ \
| * | | | | | Add dimension attributes to MediaStore.Angus Kong2011-09-294-10/+17
| |/ / / / /
* | | | | | Update the assets for focusing.Angus Kong2011-09-2912-0/+0
|/ / / / /
* | | | | Merge "Add background of pressed ModePicker."Chung-yih Wang2011-09-282-1/+21
|\ \ \ \ \
| * | | | | Add background of pressed ModePicker.Chung-yih Wang2011-09-282-1/+21
* | | | | | Merge "Change the option menu items for Crespo."Angus Kong2011-09-284-39/+37
|\ \ \ \ \ \
| * | | | | | Change the option menu items for Crespo.Angus Kong2011-09-284-39/+37
| |/ / / / /
* | | | | | am c5dca0cc: (-s ours) Merge "Import revised translations. DO NOT MERGE." in...Eric Fischer2011-09-280-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Import revised translations. DO NOT MERGE." into ics-factoryromEric Fischer2011-09-288-13/+13
| |\ \ \ \ \
| | * | | | | Import revised translations. DO NOT MERGE.Eric Fischer2011-09-288-13/+13
| | | |/ / / | | |/| | |
* | | | | | am 162675f5: Merge "Updated overflow menu in Camera Bug: 5388009" into ics-fa...Justin Ho2011-09-286-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge "Updated overflow menu in Camera Bug: 5388009" into ics-factoryromJustin Ho2011-09-286-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Updated overflow menu in CameraJustin Ho2011-09-286-0/+0
* | | | | am 0cb21101: Merge "Fix crash when starting up Camcorder mode." into ics-fact...Eino-Ville Talvala2011-09-271-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix crash when starting up Camcorder mode." into ics-factoryromEino-Ville Talvala2011-09-271-3/+5
| |\ \ \ \
| | * | | | Fix crash when starting up Camcorder mode.Eino-Ville Talvala2011-09-271-3/+5
| | | |/ / | | |/| |
* | | | | am d8e940a7: Merge "Make sure correct GL context is active when tearing down ...Eino-Ville Talvala2011-09-271-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Make sure correct GL context is active when tearing down effects." int...Eino-Ville Talvala2011-09-271-0/+8
| |\ \ \ \
| | * | | | Make sure correct GL context is active when tearing down effects.Eino-Ville Talvala2011-09-271-0/+8
| | |/ / /
* | | | | am 02963115: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Import revised translations. DO NOT MERGEEric Fischer2011-09-277-23/+14
| |/ / /
* | | | Merge "Update the zoom assets."Wei Huang2011-09-276-0/+0
|\ \ \ \
| * | | | Update the zoom assets.Chung-yih Wang2011-09-276-0/+0
* | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-270-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-260-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | am f1244801: Merge "Clear the share popup when a new thumbnail is generated."...Wu-cheng Li2011-09-273-0/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Clear the share popup when a new thumbnail is generated." into ics-fac...Wu-cheng Li2011-09-273-0/+8
| |\ \ \ \
| | * | | | Clear the share popup when a new thumbnail is generated.Wu-cheng Li2011-09-273-1/+8
| | |/ / /
* | | | | am 1743de66: Prevent re-compression of thumbnail upon closing cameraGilles-Arnaud Bleu-Laine2011-09-273-7/+16
|\ \ \ \ \ | |/ / / /
| * | | | Prevent re-compression of thumbnail upon closing cameraGilles-Arnaud Bleu-Laine2011-09-273-7/+16
| |/ / /
* | | | Remove unused assets.Chung-yih Wang2011-09-2711-0/+0
| |_|/ |/| |
* | | am 9c58ffd7: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-260-0/+0
|\ \ \ | |/ /
| * | Import revised translations. DO NOT MERGEEric Fischer2011-09-2642-253/+127
* | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-260-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-260-0/+0
| |\ \
| | * \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-250-0/+0
| | |\ \
| | | * \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-230-0/+0
| | | |\ \
* | | | \ \ am f70f0a83: Merge "Fix the bug that local preference is not reset." into ics...Wei Huang2011-09-262-25/+9
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |