summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 27562534: Merge "Finish the secure camera activity when user try to play a...ztenghui2013-10-111-5/+13
|\
| * Merge "Finish the secure camera activity when user try to play a video." into...ztenghui2013-10-121-5/+13
| |\
| | * Finish the secure camera activity when user try to play a video.ztenghui2013-10-111-5/+13
* | | am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-...Doris Liu2013-10-112-12/+6
|\| |
| * | Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbadDoris Liu2013-10-122-12/+6
| |\ \ | | |/ | |/|
| | * Bring full screen window flag back to cameraDoris Liu2013-10-112-12/+6
* | | am 3772d2f4: restore Usage StatisticsSeth Raphael2013-10-111-0/+2
|\| |
| * | restore Usage StatisticsSeth Raphael2013-10-111-0/+2
* | | am c13cc22b: Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
|\| |
| * | Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
| |/
* | am f0622191: Merge "gcam: Allow debugging postcapture image to be added to me...Ruben Brunk2013-10-111-4/+15
|\|
| * Merge "gcam: Allow debugging postcapture image to be added to mediastore." in...Ruben Brunk2013-10-111-4/+15
| |\
| | * gcam: Allow debugging postcapture image to be added to mediastore.Ruben Brunk2013-10-101-4/+15
* | | Fix build break.Sameer Padala2013-10-1149-4609/+3
* | | Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-devBaligh Uddin2013-10-1155-179/+179
|\ \ \
| * | | Revert "Revert "Import translations. DO NOT MERGE""Baligh Uddin2013-10-1155-179/+179
* | | | am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-...Angus Kong2013-10-111-4/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbadAngus Kong2013-10-111-4/+17
| |\ \ \
| | * | | Avoid unnecessary bringChildToFront() calls.Angus Kong2013-10-111-4/+17
* | | | | Merge "Revert "Import translations. DO NOT MERGE"" into klp-devBaligh Uddin2013-10-1155-179/+179
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-1155-179/+179
* | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-1155-179/+179
|\| | | |
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1155-179/+179
* | | | | am 64cea6aa: Don\'t show a details dialog if there are no details.Sascha Haeberling2013-10-101-1/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Don't show a details dialog if there are no details.Sascha Haeberling2013-10-101-1/+3
* | | | | am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-...Sascha Haeberling2013-10-101-3/+3
|\| | | |
| * | | | Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbadSascha Haeberling2013-10-111-3/+3
| |\ \ \ \
| | * | | | Don't initialize photo module if it's paused.Sascha Haeberling2013-10-101-3/+3
| | | |/ / | | |/| |
* | | | | am 36c21ca1: Merge "Check both the requestId of current item and total items ...Erin Dahlgren2013-10-101-7/+5
|\| | | |
| * | | | Merge "Check both the requestId of current item and total items in filmstrip ...Erin Dahlgren2013-10-111-7/+5
| |\ \ \ \
| | * | | | Check both the requestId of current item and total items in filmstrip for bot...Erin Dahlgren2013-10-101-7/+5
| | | |_|/ | | |/| |
* | | | | am d70f0fb6: Add fling support in zoom viewDoris Liu2013-10-101-4/+120
|\| | | |
| * | | | Add fling support in zoom viewDoris Liu2013-10-101-4/+120
* | | | | am 8c807823: Merge "Remove display change listener for mode switch" into gb-u...Doris Liu2013-10-105-2/+24
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Remove display change listener for mode switch" into gb-ub-photos-carl...Doris Liu2013-10-115-2/+24
| |\ \ \ | | |_|/ | |/| |
| | * | Remove display change listener for mode switchDoris Liu2013-10-105-2/+24
* | | | am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when ...Sascha Haeberling2013-10-103-4/+19
|\| | |
| * | | Merge "Hide the status bar and switch into lights-out mode when popup is dimi...Sascha Haeberling2013-10-103-4/+19
| |\ \ \ | | |_|/ | |/| |
| | * | Hide the status bar and switch into lights-out mode when popup is dimissed.Sascha Haeberling2013-10-103-4/+19
* | | | Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of...priya2013-10-104-9/+21
|\ \ \ \
| * | | | Increased time to wait in all tests.priya2013-10-104-9/+21
* | | | | am 23df6752: Merge "Workaround for re-applying transform on new surface texut...Doris Liu2013-10-101-7/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Workaround for re-applying transform on new surface texuture" into gb-...Doris Liu2013-10-101-7/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Workaround for re-applying transform on new surface texutureDoris Liu2013-10-101-7/+5
* | | | | am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbadMindy Pereira2013-10-1020-0/+0
|\| | | |
| * | | | Merge "Update shutter recording assets." into gb-ub-photos-carlsbadMindy Pereira2013-10-1020-0/+0
| |\ \ \ \
| | * | | | Update shutter recording assets.Mindy Pereira2013-10-0920-0/+0
| | |/ / /
* | | | | am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbadztenghui2013-10-102-1/+2
|\| | | |
| * | | | Merge "Fix flash issue" into gb-ub-photos-carlsbadztenghui2013-10-102-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix flash issueztenghui2013-10-092-1/+2