summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Convert line breaks to Unix style"James Dong2011-05-25175-29631/+29631
|\
| * Convert line breaks to Unix styleMans Rullgard2011-05-21175-29631/+29631
* | Merge "Merge chromium to 10.0.634.0: Compile fix"Kristian Monsen2011-05-251-1/+1
|\ \
| * | Merge chromium to 10.0.634.0: Compile fixKristian Monsen2011-05-251-1/+1
* | | Merge "Make sure all references to the decoder plugin are accounted for"Andreas Huber2011-05-244-2/+10
|\ \ \
| * | | Make sure all references to the decoder plugin are accounted forAndreas Huber2011-05-244-2/+10
* | | | Merge "Make sure the software mpeg4 decoder supports multiple input frames pe...Andreas Huber2011-05-242-8/+21
|\ \ \ \ | |/ / /
| * | | Make sure the software mpeg4 decoder supports multiple input frames per input...Andreas Huber2011-05-242-8/+21
* | | | am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes ...Jeffrey Tinker2011-05-242-19/+19
|\ \ \ \ | |/ / / |/| | |
| * | | am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://...Jeffrey Tinker2011-05-232-19/+19
| |\ \ \
| | * \ \ am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.c...Jeffrey Tinker2011-05-232-19/+19
| | |\ \ \
| | | * \ \ Merge "Multi-repository checkin, goes with https://android-git.corp.google.co...Jeffrey Tinker2011-05-232-19/+19
| | | |\ \ \
| | | | * | | Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
* | | | | | | resolved conflicts for merge of d5762583 to masterJames Dong2011-05-242-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am ebae1923: am a5293d1c: Add some logging to track down where ANR happens du...James Dong2011-05-232-1/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | am a5293d1c: Add some logging to track down where ANR happens during MediaPla...James Dong2011-05-232-1/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
* | | | | | Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"Glenn Kasten2011-05-231-20/+0
|\ \ \ \ \ \
| * | | | | | HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED deadGlenn Kasten2011-05-051-20/+0
* | | | | | | Reconcile with honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-130-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-310-0/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-280-0/+0
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ keep previous historyThe Android Automerger2011-03-250-0/+0
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-240-0/+0
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-230-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-220-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-210-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-180-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-170-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-160-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-150-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-140-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-100-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-080-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | * | | | | | | Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file ...James Dong2011-03-041-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: MTP: Add support for dynamically adding and removing storage unitsMike Lockwood2011-02-285-25/+95
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.Andreas Huber2011-02-282-61/+153
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-270-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-260-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \