summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c0ea805c: am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke inform...Xavier Ducrohet2010-01-212-2/+41
|\
| * am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into ...Xavier Ducrohet2010-01-182-2/+41
| |\
| | * Merge "ADT/Layoutlib: properly handle stroke information." into eclairXavier Ducrohet2010-01-152-2/+41
| | |\
| | | * ADT/Layoutlib: properly handle stroke information.Xavier Ducrohet2010-01-142-2/+41
* | | | Merge "Bug 2330111"Paul Westbrook2010-01-218-81/+410
|\ \ \ \
| * | | | Bug 2330111Paul Westbrook2010-01-218-81/+410
* | | | | Merge "Fix build, incorrect link/see tags."Wink Saville2010-01-211-3/+3
|\ \ \ \ \
| * | | | | Fix build, incorrect link/see tags.Wink Saville2010-01-211-3/+3
| |/ / / /
* | | | | Merge "Don't crash when there is no admin."Dianne Hackborn2010-01-211-9/+9
|\ \ \ \ \
| * | | | | Don't crash when there is no admin.Dianne Hackborn2010-01-211-9/+9
* | | | | | Merge changes I2d41cb94,Ia1a17985Mathias Agopian2010-01-211-5/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix [2324665] texture leak in surfaceflinger when using cameraMathias Agopian2010-01-211-1/+16
| * | | | | fix a texture leak introduced recently.Mathias Agopian2010-01-211-4/+11
* | | | | | Merge "relocate GoogleLoginService"Doug Zongker2010-01-213-7/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | relocate GoogleLoginServiceDoug Zongker2010-01-213-7/+6
* | | | | | Merge "Fix build, GsmServiceStateTracker was using old EventLog API."Wink Saville2010-01-211-2/+2
|\ \ \ \ \ \
| * | | | | | Fix build, GsmServiceStateTracker was using old EventLog API.Wink Saville2010-01-211-2/+2
* | | | | | | Fix 2385283: Use device-specific salt when generating hashes for lock passwords.Jim Miller2010-01-211-5/+21
* | | | | | | am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-210-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 4d69ac66: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-141-1/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-141-1/+2
| | |\ \ \ \ \
| | | * | | | | DO NOT MERGEGrace Kloba2010-01-141-1/+2
* | | | | | | | Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/fra...Grace Kloba2010-01-218-120/+307
|\ \ \ \ \ \ \ \
| * | | | | | | | More device policy manager / admin work.Dianne Hackborn2010-01-218-120/+307
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | am c8cab725: (-s ours) am d1019a99: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-210-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am d1019a99: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-141-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-141-1/+1
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | DO NOT MERGEGrace Kloba2010-01-141-1/+1
| | | | |/ / / | | | |/| | |
* | | | | | | am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for...Xavier Ducrohet2010-01-211-3/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into ...Xavier Ducrohet2010-01-141-3/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclairXavier Ducrohet2010-01-141-3/+9
| | |\ \ \ \ \
| | | * | | | | ADT/Layoutlib: improved gradient drawing for perf.Xavier Ducrohet2010-01-141-3/+9
* | | | | | | | am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT d...Xavier Ducrohet2010-01-211-28/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like ...Xavier Ducrohet2010-01-141-28/+32
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.Xavier Ducrohet2010-01-141-28/+32
| | |/ / / / /
* | | | | | | am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (j...Xavier Ducrohet2010-01-211-30/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." ...Xavier Ducrohet2010-01-141-30/+17
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclairXavier Ducrohet2010-01-141-30/+17
| | |\ \ \ \ \
| | | * | | | | ADT/Layoutlib: always use custom gradient (java) Paint.Xavier Ducrohet2010-01-141-30/+17
* | | | | | | | am b8c564d0: am 6a739ea8: Merge "Updated developer groups documentation to po...Roman Nurik2010-01-212-74/+67
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 6a739ea8: Merge "Updated developer groups documentation to point to Stack ...Roman Nurik2010-01-142-74/+67
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Updated developer groups documentation to point to Stack Overflow, als...Roman Nurik2010-01-142-74/+67
| | |\ \ \ \ \ \
| | | * | | | | | Updated developer groups documentation to point to Stack Overflow, also rearr...Roman Nurik2010-01-142-74/+67
* | | | | | | | | am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear g...Xavier Ducrohet2010-01-211-6/+243
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" int...Xavier Ducrohet2010-01-141-6/+243
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "ADT/Layout: support for 3+ color in linear gradients" into eclairXavier Ducrohet2010-01-141-6/+243
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | ADT/Layout: support for 3+ color in linear gradientsXavier Ducrohet2010-01-141-6/+243
* | | | | | | | Merge "Create a common method for updating the title of a download from the f...Leon Scroggins2010-01-211-0/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Create a common method for updating the title of a download from the filename.Leon Scroggins2010-01-211-0/+27
* | | | | | | | am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclairJohn Wang2010-01-212-0/+17
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |