summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" ...James Dong2011-01-261-69/+9
|\
| * am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycombJames Dong2011-01-261-69/+9
| |\
| | * Eliminate duplicated code in export methodJames Dong2011-01-261-69/+9
* | | am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honey...Dharmaray Kundargi2011-01-264-27/+245
|\ \ \ | |/ /
| * | am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycombDharmaray Kundargi2011-01-264-27/+245
| |\ \ | | |/
| | * Overlay java files Issue 3370836Dharmaray Kundargi2011-01-264-27/+245
* | | am c4132eb2: am 4991a00b: Merge "Review rework for issue 3385068 : Play gets ...Santosh Madhava2011-01-251-17/+12
|\ \ \ | |/ /
| * | am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" ...Santosh Madhava2011-01-251-17/+12
| |\ \ | | |/
| | * Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycombSantosh Madhava2011-01-251-17/+12
| | |\
| | | * Review rework for issue 3385068 : Play gets out of syncSantosh Madhava2011-01-251-17/+12
* | | | am 7196a266: am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporti...Santosh Madhava2011-01-251-3/+22
|\ \ \ \ | |/ / /
| * | | am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" int...Santosh Madhava2011-01-251-3/+22
| |\ \ \ | | |/ /
| | * | Fix for issue 3366265 : Native crash exporting movieSantosh Madhava2011-01-251-3/+22
| | |/
* | | am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI co...Mike Lockwood2011-01-252-5/+1
|\ \ \ | |/ /
| * | am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into hone...Mike Lockwood2011-01-252-5/+1
| |\ \ | | |/
| | * Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycombMike Lockwood2011-01-252-5/+1
| | |\
| | | * MTP: Fix race conditions in MtpServer JNI codeMike Lockwood2011-01-252-5/+1
* | | | am d6451721: am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of syn...Santosh Madhava2011-01-251-1/+1
|\ \ \ \ | |/ / /
| * | | am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honey...Santosh Madhava2011-01-251-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix for issue 3385068 : Play gets out of sync" into honeycombSantosh Madhava2011-01-251-1/+1
| | |\ \
| | | * | Fix for issue 3385068 : Play gets out of syncSantosh Madhava2011-01-251-1/+1
| | | |/
* | | | am e4d494b4: am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCa...Jaikumar Ganesh2011-01-251-4/+5
|\ \ \ \ | |/ / /
| * | | am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into hon...Jaikumar Ganesh2011-01-251-4/+5
| |\ \ \ | | |/ /
| | * | Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycombJaikumar Ganesh2011-01-251-4/+5
| | |\ \ | | | |/ | | |/|
| | | * Rename virtual call API to ScoUsingVirtualCall.Jaikumar Ganesh2011-01-251-4/+5
* | | | am 28ae70ce: am 23a813e1: am 996de2dd: Merge "Avoid using String.format in Me...Brad Fitzpatrick2011-01-251-5/+5
|\ \ \ \ | |/ / /
| * | | am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"Brad Fitzpatrick2011-01-251-5/+5
| |\ \ \ | | |/ / | |/| |
| | * | am 996de2dd: Merge "Avoid using String.format in MediaRecorder"Brad Fitzpatrick2011-01-241-5/+5
| | |\ \
| | | * | Avoid using String.format in MediaRecorderHenrik Backlund2011-01-241-5/+5
| | * | | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-142-59/+197
| | |\ \ \
| | | * | | Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-122-59/+197
| | * | | | am f13d4501: Send "compilation" tag when inserting into the database. It\'s n...Marco Nelissen2011-01-071-0/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Send "compilation" tag when inserting into the database.Marco Nelissen2011-01-061-0/+5
| | * | | | am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and a...Marco Nelissen2011-01-061-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-061-0/+1
| | * | | | am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output f...James Dong2010-12-221-5/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | Expose AMRNB/WB and AAC encoder and related file output formats - do not mergeJames Dong2010-12-221-5/+6
* | | | | | am 08902803: am a2edecfe: Merge "Issue no : 3370622" into honeycombDheeraj Sharma2011-01-242-10/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Issue no : 3370622Dheeraj Sharma2011-01-242-10/+4
* | | | | | am a1ec9893: am 9c0bd864: Merge "Review rework on Patch Set 2 for issue 33728...Santosh Madhava2011-01-242-11/+85
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Review rework on Patch Set 2 for issue 3372849" into honeycombSantosh Madhava2011-01-242-11/+85
| |\ \ \ \ \
| | * | | | | Review rework on Patch Set 2 for issue 3372849Santosh Madhava2011-01-242-11/+85
* | | | | | | am 1ab0ac3f: am c8de291e: Merge "Improved conversion accuracy of exif geotag ...Wu-cheng Li2011-01-241-13/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Improved conversion accuracy of exif geotag data" into honeycombWu-cheng Li2011-01-241-13/+19
| |\ \ \ \ \ \
| | * | | | | | Improved conversion accuracy of exif geotag dataOscar Rydhe2011-01-241-13/+19
* | | | | | | | am 73b38938: am 9807a7b2: Merge "Reduce the JNI native method visibility" int...James Dong2011-01-241-10/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Reduce the JNI native method visibilityJames Dong2011-01-241-10/+9
| | |/ / / / / | |/| | | | |
* | | | | | | am 47254778: am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopP...Santosh Madhava2011-01-241-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'Santosh Madhava2011-01-241-1/+3
| | |_|_|_|/ | |/| | | |
* | | | | | am 6c170ecc: am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into...Gil Dobjanschi2011-01-243-1/+44
|\ \ \ \ \ \ | |/ / / / /