summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 914972be to masterEric Laurent2011-11-051-17/+26
|\
| * Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-17/+26
| |\
| | * Fix device management in lvm effect bundle wrapper.Eric Laurent2011-11-011-17/+26
* | | resolved conflicts for merge of 79178b8b to masterEric Laurent2011-11-051-9/+19
|\ \ \ | |/ /
| * | Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-9/+19
| |\ \
| | * | Fix problem in lvm effect bundle wrapper.Eric Laurent2011-11-021-9/+19
* | | | am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
| |\ \ \
| | * | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger2011-11-021-11/+9
| | * | | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-021-9/+11
* | | | | am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input ...Dave Burke2011-11-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeo...Dave Burke2011-11-040-0/+0
| |\ \ \ \
| | * | | | DO NOT MERGE Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
* | | | | | am e395f645: Poll input data with a small timeout and don\'t consume a full c...Andreas Huber2011-11-031-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
* | | | | | am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| | * | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger2011-11-021-11/+9
| | |/ /
* | | | am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc."...Chih-Chung Chang2011-11-021-9/+11
|\ \ \ \ | |/ / /
| * | | am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0Chih-Chung Chang2011-11-011-9/+11
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge "Update camera continuous autofocus javadoc." into ics-mr0Chih-Chung Chang2011-10-311-9/+11
| | |\
| | | * Update camera continuous autofocus javadoc.Wu-cheng Li2011-10-281-9/+11
* | | | Properly decode ADTS files with ID3 headers.Andreas Huber2011-11-013-12/+60
* | | | Support new HLS byte-range extensionsAndreas Huber2011-10-314-6/+109
* | | | Merge "Bug 5522189 temporary workaround"Glenn Kasten2011-10-281-1/+1
|\ \ \ \
| * | | | Bug 5522189 temporary workaroundGlenn Kasten2011-10-281-1/+1
* | | | | am 27ed1249: Merge "Properly report that we\'re no longer playing after recei...Andreas Huber2011-10-283-4/+17
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "Properly report that we're no longer playing after receiving event" in...Andreas Huber2011-10-283-4/+17
| |\ \ \
| | * | | Properly report that we're no longer playing after receiving eventAndreas Huber2011-10-263-4/+17
* | | | | am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerServ...Jamie Gennis2011-10-284-100/+65
|\ \ \ \ \ | |/ / / /
| * | | | am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics...Jamie Gennis2011-10-284-100/+65
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Stagefright: ANW::connect in MediaPlayerServiceJamie Gennis2011-10-264-100/+65
* | | | | am da57c0e8: Merge "Report call status from AudioSource::start() to file writ...James Dong2011-10-272-2/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Report call status from AudioSource::start() to file writer" into ics-mr1James Dong2011-10-272-2/+10
| |\ \ \ \
| | * | | | Report call status from AudioSource::start() to file writerJames Dong2011-10-262-2/+10
* | | | | | am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." int...Andreas Huber2011-10-271-8/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1Andreas Huber2011-10-271-8/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix a reference to a stale pointer in AwesomePlayer.Andreas Huber2011-10-261-8/+10
| | | |/ / | | |/| |
* | | | | am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing...Jamie Gennis2011-10-262-0/+161
|\ \ \ \ \ | |/ / / /
| * | | | am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into i...Jamie Gennis2011-10-262-0/+161
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Stagefright: push blank buffers when tearing downJamie Gennis2011-10-252-0/+161
| | |/
* | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-26122-2263/+2263
|/ /
* | am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-197-1/+68
|\ \ | |/
| * Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-197-1/+68
| |\
| | * Stagefright: idle OMX after ANW errorsJamie Gennis2011-10-197-1/+68
* | | am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforcedChih-Chung Chang2011-10-191-8/+2
|\ \ \ | |/ /
| * | Fix 5487571: Make sure shutter sound is played when it's enforcedChih-Chung Chang2011-10-201-8/+2
* | | am b3cdadb6: Merge "Check whether media recorder client exists before dumping...James Dong2011-10-191-5/+7
|\ \ \ | |/ /
| * | Merge "Check whether media recorder client exists before dumping." into ics-mr0James Dong2011-10-191-5/+7
| |\ \
| | * | Check whether media recorder client exists before dumping.James Dong2011-10-181-5/+7
generated by cgit v1.1 at 2024-06-11 04:14:46 +0000