summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ebd616e8: am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF gene...Svetoslav2013-11-072-54/+137
|\
| * am 134631b9: am 90242fe5: Merge "Switch to the new Skia PDF generation APIs."...Svetoslav2013-11-072-54/+137
| |\
| | * am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-devSvetoslav2013-11-072-54/+137
| | |\
| | | * Merge "Switch to the new Skia PDF generation APIs." into klp-devSvetoslav2013-11-082-54/+137
| | | |\
| | | | * Switch to the new Skia PDF generation APIs.Svetoslav2013-11-072-54/+137
* | | | | am 1bd7918f: (-s ours) am 6bb9588d: am e81f9755: am 9dcac6f1: (-s ours) am 0f...Selim Gurun2013-11-070-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 6bb9588d: am e81f9755: am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO...Selim Gurun2013-11-070-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am e81f9755: am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO NOT MERGE Ad...Selim Gurun2013-11-070-0/+0
| | |\ \ \ | | | |/ /
| | | * | am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter...Selim Gurun2013-11-070-0/+0
| | | |\ \
| | | | * \ am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-11-073-7/+27
| | | | |\ \
| | | | | * \ am de38b23d: DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-11-073-7/+27
| | | | | |\ \
| | | | | | * | DO NOT MERGE Add a delimiter between scheme and hostSelim Gurun2013-11-073-7/+27
* | | | | | | | am eaacc7c1: am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keygu...Jim Miller2013-11-071-72/+85
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music tra...Jim Miller2013-11-071-72/+85
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into ...Jim Miller2013-11-071-72/+85
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fix scrubbing behavior on keyguard music transport" into klp-devJim Miller2013-11-071-72/+85
| | | |\ \ \ \ \
| | | | * | | | | Fix scrubbing behavior on keyguard music transportJim Miller2013-11-061-72/+85
* | | | | | | | | Merge "Add methods for removing children and actions from A11y nodes"Alan Viverette2013-11-077-53/+333
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add methods for removing children and actions from A11y nodesAlan Viverette2013-11-067-53/+333
* | | | | | | | | | am 25f6d3e6: am f7dea15b: am c9ffd746: Merge "Don\'t call setTask twice." int...Craig Mautner2013-11-071-9/+22
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am f7dea15b: am c9ffd746: Merge "Don\'t call setTask twice." into klp-devCraig Mautner2013-11-071-9/+22
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am c9ffd746: Merge "Don\'t call setTask twice." into klp-devCraig Mautner2013-11-071-9/+22
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Don't call setTask twice." into klp-devCraig Mautner2013-11-071-9/+22
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Don't call setTask twice.Craig Mautner2013-11-071-9/+22
* | | | | | | | | | | am bf98c0cc: am c0eb7e7b: am 20409674: Merge "If home activity is not fullscr...Craig Mautner2013-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am c0eb7e7b: am 20409674: Merge "If home activity is not fullscreen keep dril...Craig Mautner2013-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 20409674: Merge "If home activity is not fullscreen keep drilling." into k...Craig Mautner2013-11-071-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "If home activity is not fullscreen keep drilling." into klp-devCraig Mautner2013-11-071-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | If home activity is not fullscreen keep drilling.Craig Mautner2013-11-071-1/+1
| | | | |/ / / / / / /
* | | | | | | | | | | am 0be8fa71: am e43780c6: am ff49e2d9: Merge "Improve RTL support for Immersi...Fabrice Di Meglio2013-11-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am e43780c6: am ff49e2d9: Merge "Improve RTL support for Immersive mode" into...Fabrice Di Meglio2013-11-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am ff49e2d9: Merge "Improve RTL support for Immersive mode" into klp-devFabrice Di Meglio2013-11-071-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Improve RTL support for Immersive mode" into klp-devFabrice Di Meglio2013-11-071-2/+2
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Improve RTL support for Immersive modeFabrice Di Meglio2013-11-061-2/+2
* | | | | | | | | | | | am 4833a6ce: am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling lo...Fabrice Di Meglio2013-11-072-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (K...Fabrice Di Meglio2013-11-072-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missin...Fabrice Di Meglio2013-11-072-2/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left paddin...Fabrice Di Meglio2013-11-072-2/+3
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix bug #11537133 Hideycling looks broken (KOT36), missing left paddingFabrice Di Meglio2013-11-062-2/+3
| | | | |/ / / / / / / /
* | | | | | | | | | | | resolved conflicts for merge of c3eef190 to masterRobert Greenwalt2013-11-0711-50/+333
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning."...Robert Greenwalt2013-11-0711-50/+332
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-devRobert Greenwalt2013-11-0711-51/+333
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Add BatteryStats for Wifi Batched Scanning." into klp-devRobert Greenwalt2013-11-0711-51/+333
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add BatteryStats for Wifi Batched Scanning.Robert Greenwalt2013-11-0611-51/+333
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
* | | | | | | | | | | | Merge "Fix the race condition for b/11458382"Ashish Sharma2013-11-071-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix the race condition for b/11458382Ashish Sharma2013-11-041-6/+6
* | | | | | | | | | | | | am 03be79b3: am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retain...Dianne Hackborn2013-11-077-126/+237
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service s...Dianne Hackborn2013-11-077-126/+237
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 9882d388: Merge "Fix issue #11223338: Not retaining service started state ...Dianne Hackborn2013-11-077-126/+237
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "Fix issue #11223338: Not retaining service started state while restart...Dianne Hackborn2013-11-077-126/+237
| | | |\ \ \ \ \ \ \ \ \ \