summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am f6028359: am f2fe3505: am 31518f74: Merge "Use build property for CEC devi...Jinsuk Kim2014-04-033-65/+30
|\
| * am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" ...Jinsuk Kim2014-04-033-65/+30
| |\
| | * am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modu...Jinsuk Kim2014-04-033-65/+30
| | |\
| | | * Use build property for CEC device OSD nameJinsuk Kim2014-04-033-65/+30
* | | | am c9cb9138: am 4c963841: am b1dca162: Merge "Maintain display power status f...Jinsuk Kim2014-04-034-13/+197
|\ \ \ \ | |/ / /
| * | | am 4c963841: am b1dca162: Merge "Maintain display power status for playback d...Jinsuk Kim2014-04-034-13/+197
| |\ \ \ | | |/ /
| | * | am b1dca162: Merge "Maintain display power status for playback device" into k...Jinsuk Kim2014-04-024-13/+197
| | |\ \ | | | |/
| | | * Merge "Maintain display power status for playback device" into klp-modular-devJinsuk Kim2014-04-024-13/+197
| | | |\
| | | | * Maintain display power status for playback deviceJinsuk Kim2014-04-024-13/+197
* | | | | am a7d9b937: Merge "Refuse update of a system app if it changes its shared uid"Christopher Tate2014-04-031-2/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Refuse update of a system app if it changes its shared uid"Christopher Tate2014-04-031-2/+13
| |\ \ \ \
| | * | | | Refuse update of a system app if it changes its shared uidChristopher Tate2014-04-021-2/+13
* | | | | | am b325345e: Merge "Switch framework Holo references to Quantum.Light"Alan Viverette2014-04-021-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Switch framework Holo references to Quantum.Light"Alan Viverette2014-04-021-1/+1
| |\ \ \ \ \
| | * | | | | Switch framework Holo references to Quantum.LightAlan Viverette2014-04-011-1/+1
* | | | | | | Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-devJorim Jaggi2014-04-021-14/+9
|\ \ \ \ \ \ \
| * | | | | | | Wait for Keyguard to be drawn after boot.Jorim Jaggi2014-04-021-14/+9
* | | | | | | | am af31a7d1: Merge "add variance to notification usage stats"Chris Wren2014-04-021-6/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "add variance to notification usage stats"Chris Wren2014-04-021-6/+12
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | add variance to notification usage statsChris Wren2014-04-021-6/+12
* | | | | | | | am f4824a06: Fix issue with not allowing activities for current user.Kenny Guy2014-04-023-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix issue with not allowing activities for current user.Kenny Guy2014-04-023-2/+5
* | | | | | | | am 1ccace91: Merge "Rename related users to profiles."Kenny Guy2014-04-027-114/+119
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Rename related users to profiles."Kenny Guy2014-04-027-114/+119
| |\ \ \ \ \ \ \
| | * | | | | | | Rename related users to profiles.Kenny Guy2014-04-027-114/+119
| | |/ / / / / /
* | | | | | | | am b69bb445: resolved conflicts for merge of 71ab4f4f to masterNarayan Kamath2014-04-022-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | resolved conflicts for merge of 71ab4f4f to masterNarayan Kamath2014-04-022-3/+2
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."Narayan Kamath2014-04-022-3/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."Narayan Kamath2014-04-022-3/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Move zygote startup logic to the frameworks.Narayan Kamath2014-04-022-3/+2
* | | | | | | | | | am 118d252e: am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask...Michael Kolb2014-04-022-0/+155
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask to circular ...Michael Kolb2014-04-022-0/+155
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into...Michael Kolb2014-04-012-0/+155
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Add circular anti-aliasing mask to circular displayMichael Kolb2014-04-012-0/+155
* | | | | | | | | | am a2dbe4e3: Merge "Rejigger the invalid-key checks at backup time"Christopher Tate2014-04-011-4/+46
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Rejigger the invalid-key checks at backup timeChristopher Tate2014-04-011-4/+46
* | | | | | | | | | am f74aa094: Handle bad package name arguments sensicallyChristopher Tate2014-04-011-21/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Handle bad package name arguments sensicallyChristopher Tate2014-04-011-21/+26
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | am 6f127c9b: Merge "Initial implementation of USB Audio output."Paul McLean2014-04-011-1/+93
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Initial implementation of USB Audio output."Paul McLean2014-04-011-1/+93
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Initial implementation of USB Audio output.Paul McLean2014-03-311-1/+93
* | | | | | | | | | am df42723d: Merge "Don\'t double prompt on booting encrypted device"Paul Lawrence2014-04-012-1/+111
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Don't double prompt on booting encrypted device"Paul Lawrence2014-04-012-1/+111
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Don't double prompt on booting encrypted devicePaul Lawrence2014-03-282-1/+111
* | | | | | | | | | am 0e290b77: am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SE...Nick Kralevich2014-03-312-9/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel...Nick Kralevich2014-03-312-9/+21
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/dat...Nick Kralevich2014-03-312-9/+21
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."Nick Kralevich2014-03-312-9/+21
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Merge "Change when the SELinux relabel of /data/data occurs."Nick Kralevich2014-03-312-9/+21
| | | | |\ \ \ \ \
| | | | | * | | | | Change when the SELinux relabel of /data/data occurs.Robert Craig2014-03-282-9/+21