| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to master | The Android Automerger | 2011-09-14 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Bug 5270905 fix MediaPlayer with IStreamSource | Glenn Kasten | 2011-09-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to master | The Android Automerger | 2011-09-07 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Handle setDataSource failures properly. #5261671 | Dave Burke | 2011-09-06 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to master | The Android Automerger | 2011-09-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-02 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-31 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 8 | -46/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 8 | -88/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-24 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-23 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-17 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-02 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-08-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Fix issue 5090721: audio record broken | Eric Laurent | 2011-07-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-07 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Poll input data with a small timeout and don't consume a full core. | Andreas Huber | 2011-11-04 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 914972be to master | Eric Laurent | 2011-11-05 | 1 | -17/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 | Eric Laurent | 2011-11-04 | 1 | -17/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix device management in lvm effect bundle wrapper. | Eric Laurent | 2011-11-01 | 1 | -17/+26 |
| | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 79178b8b to master | Eric Laurent | 2011-11-05 | 1 | -9/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 | Eric Laurent | 2011-11-04 | 1 | -9/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problem in lvm effect bundle wrapper. | Eric Laurent | 2011-11-02 | 1 | -9/+19 |
| | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" | The Android Automerger | 2011-11-02 | 1 | -11/+9 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in ics-factoryrom-2-release history after reset to ics-mr0 | The Android Automerger | 2011-11-02 | 1 | -9/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input ... | Dave Burke | 2011-11-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeo... | Dave Burke | 2011-11-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Poll input data with a small timeout and don't consume a full core. | Andreas Huber | 2011-11-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e395f645: Poll input data with a small timeout and don\'t consume a full c... | Andreas Huber | 2011-11-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Poll input data with a small timeout and don't consume a full core. | Andreas Huber | 2011-11-03 | 1 | -1/+1 |
| | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
