summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am a6e14c82: am 75b25577: am 448403b7: Merge "Dont call close in in Bluetooth...Mike Lockwood2014-12-051-1/+2
|\
| * am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"Mike Lockwood2014-12-041-1/+2
| |\
| | * Merge "Dont call close in in BluetoothA2dp finalize"Mike Lockwood2014-12-041-1/+2
| | |\
| | | * Dont call close in in BluetoothA2dp finalizeMathias Jeppsson2014-11-071-1/+2
* | | | resolved conflicts for merge of 203c8171 to masterJohn Reck2014-12-044-180/+29
|\ \ \ \ | |/ / /
| * | | am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cl...Derek Sollenberger2014-12-044-180/+29
| |\ \ \
| | * \ \ am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up mem...Derek Sollenberger2014-12-044-180/+29
| | |\ \ \
| | | * \ \ Merge "Update AndroidPixelRef to prevent VM from cleaning up memory premature...Derek Sollenberger2014-12-044-180/+29
| | | |\ \ \
| | | | * | | Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.Derek Sollenberger2014-12-034-180/+29
| | | * | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-12-043-469/+469
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-033-469/+469
| | | | |/ / /
* | | | | | | Camera2: add toString implementation of LensShadingMapYin-Chia Yeh2014-12-041-0/+45
* | | | | | | am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELA...Erik Kline2014-12-042-14/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends...Erik Kline2014-12-042-14/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-m...Erik Kline2014-12-042-14/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-devErik Kline2014-12-042-14/+2
| | | |\ \ \ \
| | | | * | | | Remove CONNECTIVITY_CHANGE_DELAY and friends.Erik Kline2014-10-312-14/+2
* | | | | | | | am 7c614473: am 36ccf75b: am fb754252: UICC : discard language setting of SIMduho.ro2014-12-045-0/+67
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 36ccf75b: am fb754252: UICC : discard language setting of SIMduho.ro2014-12-045-0/+67
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am fb754252: UICC : discard language setting of SIMduho.ro2014-12-045-0/+67
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | UICC : discard language setting of SIMduho.ro2014-12-045-0/+67
* | | | | | | | am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" in...Cheuksan Wang2014-12-049-535/+447
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-devCheuksan Wang2014-12-049-535/+447
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-devCheuksan Wang2014-12-049-535/+447
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "new SMS/MMS carrier app API" into lmp-mr1-devCheuksan Wang2014-12-049-535/+447
| | | |\ \ \ \ \
| | | | * | | | | new SMS/MMS carrier app APICheuksan Wang2014-12-019-535/+447
* | | | | | | | | resolved conflicts for merge of a75b0ad3 to masterJohn Reck2014-12-044-8/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aospJohn Reck2014-12-044-8/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-devJohn Reck2014-12-044-8/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-devJohn Reck2014-12-044-8/+12
| | | |\ \ \ \ \ \
| | | | * | | | | | Resume RT-animations after a pauseSurfaceJohn Reck2014-12-034-8/+12
| | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore accept...Christopher Tate2014-12-041-3/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria...Christopher Tate2014-12-041-3/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr...Christopher Tate2014-12-041-3/+6
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-devChristopher Tate2014-12-031-3/+6
| | | |\ \ \ \ \ \
| | | | * | | | | | Adjust wallpaper-restore acceptance criteriaChristopher Tate2014-12-031-3/+6
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-devGeoff Mendal2014-12-043-7/+7
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-033-7/+7
* | | | | | | | | | | am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming sta...Robert Greenwalt2014-12-046-0/+113
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" ...Robert Greenwalt2014-12-046-0/+113
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-devRobert Greenwalt2014-12-036-0/+113
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Separate voice/data roaming state and type" into lmp-mr1-devRobert Greenwalt2014-12-036-0/+113
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Separate voice/data roaming state and typeJing Zhao2014-12-026-0/+113
* | | | | | | | | | | | am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capabil...Eino-Ville Talvala2014-12-041-20/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ...Eino-Ville Talvala2014-12-041-20/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am d23f8b44: Merge "Revert "Camera: Add new capability flags as system featur...Eino-Ville Talvala2014-12-031-20/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Revert "Camera: Add new capability flags as system features as well"" ...Eino-Ville Talvala2014-12-031-20/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Revert "Camera: Add new capability flags as system features as well"Eino-Ville Talvala2014-12-031-20/+0
* | | | | | | | | | | | | am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Applicatio...Dianne Hackborn2014-12-041-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and p...Dianne Hackborn2014-12-041-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /