Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am a6e14c82: am 75b25577: am 448403b7: Merge "Dont call close in in Bluetooth... | Mike Lockwood | 2014-12-05 | 1 | -1/+2 |
|\ | |||||
| * | am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize" | Mike Lockwood | 2014-12-04 | 1 | -1/+2 |
| |\ | |||||
| | * | Merge "Dont call close in in BluetoothA2dp finalize" | Mike Lockwood | 2014-12-04 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Dont call close in in BluetoothA2dp finalize | Mathias Jeppsson | 2014-11-07 | 1 | -1/+2 |
* | | | | resolved conflicts for merge of 203c8171 to master | John Reck | 2014-12-04 | 4 | -180/+29 |
|\ \ \ \ | |/ / / | |||||
| * | | | am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cl... | Derek Sollenberger | 2014-12-04 | 4 | -180/+29 |
| |\ \ \ | |||||
| | * \ \ | am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up mem... | Derek Sollenberger | 2014-12-04 | 4 | -180/+29 |
| | |\ \ \ | |||||
| | | * \ \ | Merge "Update AndroidPixelRef to prevent VM from cleaning up memory premature... | Derek Sollenberger | 2014-12-04 | 4 | -180/+29 |
| | | |\ \ \ | |||||
| | | | * | | | Update AndroidPixelRef to prevent VM from cleaning up memory prematurely. | Derek Sollenberger | 2014-12-03 | 4 | -180/+29 |
| | | * | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev | Geoff Mendal | 2014-12-04 | 3 | -469/+469 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2014-12-03 | 3 | -469/+469 |
| | | | |/ / / | |||||
* | | | | | | | Camera2: add toString implementation of LensShadingMap | Yin-Chia Yeh | 2014-12-04 | 1 | -0/+45 |
* | | | | | | | am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELA... | Erik Kline | 2014-12-04 | 2 | -14/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends... | Erik Kline | 2014-12-04 | 2 | -14/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-m... | Erik Kline | 2014-12-04 | 2 | -14/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev | Erik Kline | 2014-12-04 | 2 | -14/+2 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Remove CONNECTIVITY_CHANGE_DELAY and friends. | Erik Kline | 2014-10-31 | 2 | -14/+2 |
* | | | | | | | | am 7c614473: am 36ccf75b: am fb754252: UICC : discard language setting of SIM | duho.ro | 2014-12-04 | 5 | -0/+67 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 36ccf75b: am fb754252: UICC : discard language setting of SIM | duho.ro | 2014-12-04 | 5 | -0/+67 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am fb754252: UICC : discard language setting of SIM | duho.ro | 2014-12-04 | 5 | -0/+67 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | UICC : discard language setting of SIM | duho.ro | 2014-12-04 | 5 | -0/+67 |
* | | | | | | | | am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" in... | Cheuksan Wang | 2014-12-04 | 9 | -535/+447 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev | Cheuksan Wang | 2014-12-04 | 9 | -535/+447 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev | Cheuksan Wang | 2014-12-04 | 9 | -535/+447 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge "new SMS/MMS carrier app API" into lmp-mr1-dev | Cheuksan Wang | 2014-12-04 | 9 | -535/+447 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | new SMS/MMS carrier app API | Cheuksan Wang | 2014-12-01 | 9 | -535/+447 |
* | | | | | | | | | resolved conflicts for merge of a75b0ad3 to master | John Reck | 2014-12-04 | 4 | -8/+12 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp | John Reck | 2014-12-04 | 4 | -8/+12 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev | John Reck | 2014-12-04 | 4 | -8/+12 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev | John Reck | 2014-12-04 | 4 | -8/+12 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Resume RT-animations after a pauseSurface | John Reck | 2014-12-03 | 4 | -8/+12 |
| | | | | |_|/ / / | | | | |/| | | | | |||||
* | | | | | | | | | am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore accept... | Christopher Tate | 2014-12-04 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria... | Christopher Tate | 2014-12-04 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr... | Christopher Tate | 2014-12-04 | 1 | -3/+6 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev | Christopher Tate | 2014-12-03 | 1 | -3/+6 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Adjust wallpaper-restore acceptance criteria | Christopher Tate | 2014-12-03 | 1 | -3/+6 |
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev | Geoff Mendal | 2014-12-04 | 3 | -7/+7 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2014-12-03 | 3 | -7/+7 |
* | | | | | | | | | | | am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming sta... | Robert Greenwalt | 2014-12-04 | 6 | -0/+113 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" ... | Robert Greenwalt | 2014-12-04 | 6 | -0/+113 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev | Robert Greenwalt | 2014-12-03 | 6 | -0/+113 |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merge "Separate voice/data roaming state and type" into lmp-mr1-dev | Robert Greenwalt | 2014-12-03 | 6 | -0/+113 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Separate voice/data roaming state and type | Jing Zhao | 2014-12-02 | 6 | -0/+113 |
* | | | | | | | | | | | | am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capabil... | Eino-Ville Talvala | 2014-12-04 | 1 | -20/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ... | Eino-Ville Talvala | 2014-12-04 | 1 | -20/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am d23f8b44: Merge "Revert "Camera: Add new capability flags as system featur... | Eino-Ville Talvala | 2014-12-03 | 1 | -20/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge "Revert "Camera: Add new capability flags as system features as well"" ... | Eino-Ville Talvala | 2014-12-03 | 1 | -20/+0 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Revert "Camera: Add new capability flags as system features as well" | Eino-Ville Talvala | 2014-12-03 | 1 | -20/+0 |
* | | | | | | | | | | | | | am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Applicatio... | Dianne Hackborn | 2014-12-04 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and p... | Dianne Hackborn | 2014-12-04 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / |