Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Convert line breaks to Unix style" | James Dong | 2011-05-25 | 175 | -29631/+29631 |
|\ | |||||
| * | Convert line breaks to Unix style | Mans Rullgard | 2011-05-21 | 175 | -29631/+29631 |
* | | Merge "Merge chromium to 10.0.634.0: Compile fix" | Kristian Monsen | 2011-05-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | Merge chromium to 10.0.634.0: Compile fix | Kristian Monsen | 2011-05-25 | 1 | -1/+1 |
* | | | Merge "Make sure all references to the decoder plugin are accounted for" | Andreas Huber | 2011-05-24 | 4 | -2/+10 |
|\ \ \ | |||||
| * | | | Make sure all references to the decoder plugin are accounted for | Andreas Huber | 2011-05-24 | 4 | -2/+10 |
* | | | | Merge "Make sure the software mpeg4 decoder supports multiple input frames pe... | Andreas Huber | 2011-05-24 | 2 | -8/+21 |
|\ \ \ \ | |/ / / | |||||
| * | | | Make sure the software mpeg4 decoder supports multiple input frames per input... | Andreas Huber | 2011-05-24 | 2 | -8/+21 |
* | | | | am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes ... | Jeffrey Tinker | 2011-05-24 | 2 | -19/+19 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://... | Jeffrey Tinker | 2011-05-23 | 2 | -19/+19 |
| |\ \ \ | |||||
| | * \ \ | am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.c... | Jeffrey Tinker | 2011-05-23 | 2 | -19/+19 |
| | |\ \ \ | |||||
| | | * \ \ | Merge "Multi-repository checkin, goes with https://android-git.corp.google.co... | Jeffrey Tinker | 2011-05-23 | 2 | -19/+19 |
| | | |\ \ \ | |||||
| | | | * | | | Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 | Jeffrey Tinker | 2011-05-23 | 2 | -19/+19 |
* | | | | | | | resolved conflicts for merge of d5762583 to master | James Dong | 2011-05-24 | 2 | -1/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | am ebae1923: am a5293d1c: Add some logging to track down where ANR happens du... | James Dong | 2011-05-23 | 2 | -1/+7 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | am a5293d1c: Add some logging to track down where ANR happens during MediaPla... | James Dong | 2011-05-23 | 2 | -1/+7 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Add some logging to track down where ANR happens during MediaPlayer._release(). | James Dong | 2011-05-23 | 2 | -1/+7 |
* | | | | | | Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead" | Glenn Kasten | 2011-05-23 | 1 | -20/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead | Glenn Kasten | 2011-05-05 | 1 | -20/+0 |
* | | | | | | | Reconcile with honeycomb-mr1-release | The Android Open Source Project | 2011-05-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-27 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-25 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-13 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-31 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-28 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ | keep previous history | The Android Automerger | 2011-03-25 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ | keep previous history | The Android Automerger | 2011-03-25 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-24 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-23 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-22 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-21 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-18 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-17 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-16 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-14 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-07 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | * | | | | | | | Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file ... | James Dong | 2011-03-04 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with honeycomb-release | The Android Open Source Project | 2011-05-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units | Mike Lockwood | 2011-02-28 | 5 | -25/+95 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues. | Andreas Huber | 2011-02-28 | 2 | -61/+153 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in honeycomb-release history after reset to honeycomb | The Android Automerger | 2011-02-03 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in honeycomb-release history after reset to honeycomb | The Android Automerger | 2011-01-31 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in honeycomb-release history after reset to honeycomb | The Android Automerger | 2011-01-30 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in honeycomb-release history after reset to honeycomb | The Android Automerger | 2011-01-28 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in honeycomb-release history after reset to honeycomb | The Android Automerger | 2011-01-27 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in honeycomb-release history after reset to honeycomb | The Android Automerger | 2011-01-26 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |