summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 73e243c4: Merge "Fix logging typos in GpsLocationProvider"Victoria Lease2013-01-021-3/+3
|\
| * Merge "Fix logging typos in GpsLocationProvider"Victoria Lease2013-01-021-3/+3
| |\
| | * Fix logging typos in GpsLocationProviderMagnus Eriksson2012-12-211-3/+3
* | | am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is...Irfan Sheriff2012-12-211-123/+129
|\ \ \ | |/ /
| * | Merge "NsdService: Clear client info after resolution request is serviced."Irfan Sheriff2012-12-201-123/+129
| |\ \ | | |/ | |/|
| | * NsdService: Clear client info after resolution request is serviced.Vairavan Srinivasan2012-08-231-123/+129
* | | am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is unexpecte...satok2012-12-191-0/+9
|\ \ \
| * \ \ am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
| |\ \ \
| | * | | Fix a bug where disabled auxilialy IME is unexpectedly re-enabledsatok2012-12-191-0/+9
* | | | | Merge from AOSP staging branchJean-Baptiste Queru2012-12-181-2/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Return error upon attempt to use non-existent APN"Robert Greenwalt2012-12-181-2/+5
| |\ \ \ \
| | * | | | Return error upon attempt to use non-existent APNMikael Hedegren2012-12-181-2/+5
* | | | | | am 81e3c9ed: am d2a21d7f: Merge "Fade recents thumbnail to transparent earlie...Jamie Gennis2012-12-171-3/+17
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am d2a21d7f: Merge "Fade recents thumbnail to transparent earlier." into jb-m...Jamie Gennis2012-12-171-3/+17
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fade recents thumbnail to transparent earlier.Craig Mautner2012-12-171-3/+17
* | | | | | am 7739a5ca: am f5df689a: Fix NPE inside DreamManagerService.John Spurlock2012-12-141-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f5df689a: Fix NPE inside DreamManagerService.John Spurlock2012-12-141-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix NPE inside DreamManagerService.John Spurlock2012-12-141-0/+3
* | | | | | am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts."Jeff Sharkey2012-12-121-5/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Remove unnecessary locking for screen broadcasts."Jeff Sharkey2012-12-121-5/+3
| |\ \ \ \ \
| | * | | | | Remove unnecessary locking for screen broadcasts.Jeff Sharkey2012-12-041-5/+3
* | | | | | | am 79e0e3fd: Merge "return value of String.replace() is ignored."Robert Greenwalt2012-12-111-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "return value of String.replace() is ignored."Robert Greenwalt2012-12-111-2/+2
| |\ \ \ \ \ \
| | * | | | | | return value of String.replace() is ignored.You Kim2012-10-281-2/+2
* | | | | | | | am 534de491: Merge "Make immersive mode public & imply update locking" into j...Christopher Tate2012-12-111-1/+44
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-devChristopher Tate2012-12-111-1/+44
| |\ \ \ \ \ \ \
| | * | | | | | | Make immersive mode public & imply update lockingChristopher Tate2012-12-101-1/+44
* | | | | | | | | am ae5cc868: am 2735795f: Merge "If freeCache deletes APK, give out of space ...Kenny Root2012-12-111-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 2735795f: Merge "If freeCache deletes APK, give out of space error" into j...Kenny Root2012-12-111-0/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-devKenny Root2012-12-111-0/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | If freeCache deletes APK, give out of space errorKenny Root2012-12-111-0/+12
* | | | | | | | | | am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." ...Jeff Brown2012-12-112-0/+51
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1...Jeff Brown2012-12-112-0/+51
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Play a tone when wireless charging begins." into jb-mr1.1-devJeff Brown2012-12-112-0/+51
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Play a tone when wireless charging begins.Jeff Brown2012-12-112-0/+51
| | | |/ / / / / / /
* | | | | | | | | | am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current dre...John Spurlock2012-12-111-1/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 5def50da: Merge "Fallback to default dream if the current dream is removed...John Spurlock2012-12-111-1/+34
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fallback to default dream if the current dream is removed.John Spurlock2012-12-101-1/+34
| | |/ / / / / / /
* | | | | | | | | am a98cd512: Merge "Use asynchronous messages for input method events." into ...Mita Yun2012-12-101-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Use asynchronous messages for input method events." into jb-mr1-aah-devMita Yun2012-12-101-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Use asynchronous messages for input method events.Mita Yun2012-12-061-2/+2
* | | | | | | | | am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFling...Sascha Prueter2012-12-072-39/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT ME...Sascha Prueter2012-12-072-39/+53
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGECraig Mautner2012-12-072-39/+53
* | | | | | | | am ff411ddb: Merge "Framework: Use holo alert drawables"Adam Powell2012-12-071-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "Framework: Use holo alert drawables"Adam Powell2012-12-071-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Framework: Use holo alert drawablesBjörn Lundén2012-11-151-1/+1
* | | | | | | | | am 5b6069ce: Merge "Wrong parameter in LocationManagerService"Victoria Lease2012-12-071-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Wrong parameter in LocationManagerService"Victoria Lease2012-12-061-2/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Wrong parameter in LocationManagerServiceYou Kim2012-12-071-2/+1
| | | |_|_|_|_|/ / | | |/| | | | | |