summaryrefslogtreecommitdiffstats
path: root/services/core
Commit message (Expand)AuthorAgeFilesLines
* am e2f6373c: Merge "Heads-up notifications for low battery warnings." into lm...John Spurlock2014-06-121-0/+13
|\
| * Merge "Heads-up notifications for low battery warnings." into lmp-preview-devJohn Spurlock2014-06-101-0/+13
| |\
| | * Heads-up notifications for low battery warnings.John Spurlock2014-06-111-0/+13
| * | Merge "Minor changes to the LinkAddress API docs." into lmp-preview-devRobert Greenwalt2014-06-103-8/+8
| |\ \
| | * | Minor changes to the LinkAddress API docs.Lorenzo Colitti2014-06-113-8/+8
| * | | Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-devRobert Greenwalt2014-06-113-7/+7
| |\ \ \
| | * | | Add a new IpPrefix class and use it in RouteInfo.Sreeram Ramachandran2014-06-113-7/+7
| | | |/ | | |/|
* | | | am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-pr...Robert Greenwalt2014-06-121-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-devRobert Greenwalt2014-06-111-2/+2
| |\ \ \
| | * | | Make NetworkCapabilities publicly immutable.Robert Greenwalt2014-06-111-2/+2
| | |/ /
* | | | am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs...RoboErik2014-06-121-0/+5
|\ \ \ \ | |/ / /
| * | | Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-pr...RoboErik2014-06-111-0/+5
| |\ \ \ | | |/ / | |/| |
| | * | b/15330955 Make RemoteController use the new session APIsRoboErik2014-06-111-0/+5
* | | | am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightl...Christopher Tate2014-06-121-8/+18
|\ \ \ \ | |/ / /
| * | | Merge "Relax duplicate-permission-definition constraints slightly" into lmp-p...Christopher Tate2014-06-111-8/+18
| |\ \ \
| | * | | Relax duplicate-permission-definition constraints slightlyChristopher Tate2014-06-051-8/+18
| * | | | Merge "Fix public API of LinkProperties." into lmp-preview-devRobert Greenwalt2014-06-103-7/+8
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix public API of LinkProperties.Robert Greenwalt2014-06-103-7/+8
| * | | | Merge "Correcting a bug related to Uri permissions." into lmp-preview-devNicolas Prevot2014-06-101-0/+3
| |\ \ \ \
| | * | | | Correcting a bug related to Uri permissions.Nicolas Prevot2014-06-111-0/+3
| | | |_|/ | | |/| |
* | | | | Merge "Add call to set power mode for display"Jeff Brown2014-06-121-11/+11
|\ \ \ \ \
| * | | | | Add call to set power mode for displayPrashant Malani2014-06-041-11/+11
* | | | | | Moving and resizing windows not reported propely for accessibility.Svetoslav2014-06-123-1/+24
* | | | | | Use model name for local devices' osd name.Jungshik Jang2014-06-121-3/+3
* | | | | | Merge "Move message handling logic to local device instead of service."Jungshik Jang2014-06-109-103/+283
|\ \ \ \ \ \
| * | | | | | Move message handling logic to local device instead of service.Jungshik Jang2014-06-129-103/+283
* | | | | | | Merge commit 'f5030ecb' into manualmergeCraig Mautner2014-06-112-35/+67
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 4a9f1298: Close ActivityView and ActivityContainer cleanly.Craig Mautner2014-06-122-36/+66
| |\ \ \ \ \ \ \
| | * | | | | | | Close ActivityView and ActivityContainer cleanly.Craig Mautner2014-06-112-36/+66
* | | | | | | | | am 6d758619: Merge "Implement control of auto power save mode." into lmp-prev...Dianne Hackborn2014-06-122-16/+77
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge "Implement control of auto power save mode." into lmp-preview-devDianne Hackborn2014-06-102-16/+77
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Implement control of auto power save mode.Dianne Hackborn2014-06-112-16/+77
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | am f894cad0: Merge "Some tweaks to improve document task creation." into lmp-...Dianne Hackborn2014-06-123-3/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Some tweaks to improve document task creation." into lmp-preview-devDianne Hackborn2014-06-103-3/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Some tweaks to improve document task creation.Dianne Hackborn2014-06-103-3/+13
| | |/ / / / / / /
| * | | | | | | | Hide status bars in lock taskjustinzhang2014-06-111-0/+56
| |/ / / / / / /
* | | | | | | | Merge "Temporary removing the Trust Agent permission change."Jay Civelli2014-06-101-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Temporary removing the Trust Agent permission change.Jay Civelli2014-06-111-0/+4
* | | | | | | | | am 28084383: am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intent...Craig Mautner2014-06-111-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-...Craig Mautner2014-06-111-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-devCraig Mautner2014-06-111-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add NO_ANIMATION flag to ActivityView Intents.Craig Mautner2014-06-101-1/+1
* | | | | | | | | | resolved conflicts for merge of 579ace03 to masterKenny Root2014-06-111-9/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 9f637d10: Reduce notification service historical archive size to 1 for wat...Griff Hazen2014-06-111-9/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Reduce notification service historical archive size to 1 for watches.Griff Hazen2014-06-101-9/+13
| | |/ / / / / / /
* | | | | | | | | am d6d72e5b: Merge "Fix battery controller non-fire bug" into lmp-preview-devMatthew Williams2014-06-111-7/+34
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Fix battery controller non-fire bugMatthew Williams2014-06-101-7/+34
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | am 67691d13: Merge "Fix build" into lmp-preview-devChristopher Tate2014-06-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix buildChristopher Tate2014-06-101-1/+1
* | | | | | | | am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-devChristopher Tate2014-06-1114-1299/+1280
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |