summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am e8200873: am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypefa...Victoria Lease2013-10-041-0/+1
|\
| * am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we ...Victoria Lease2013-10-041-0/+1
| |\
| | * Merge "reset mShapingPaint's SkTypeface before we use it" into klp-devVictoria Lease2013-10-051-0/+1
| | |\
| | | * reset mShapingPaint's SkTypeface before we use itVictoria Lease2013-10-041-0/+1
* | | | am 133c1faf: am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into kl...Svetoslav2013-10-043-3/+16
|\ \ \ \ | |/ / /
| * | | am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-devSvetoslav2013-10-043-3/+16
| |\ \ \ | | |/ /
| | * | Merge "Small print API tweaks" into klp-devSvetoslav2013-10-043-3/+16
| | |\ \
| | | * | Small print API tweaksSvetoslav2013-10-043-3/+16
* | | | | am 5c44b36b: am 3980ae47: am 845d9192: Merge "Enable transitions in lockscree...Chet Haase2013-10-042-8/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 3980ae47: am 845d9192: Merge "Enable transitions in lockscreen media contr...Chet Haase2013-10-042-8/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "Enable transitions in lockscreen media controller" into klp-devChet Haase2013-10-042-8/+6
| | |\ \ \
| | | * | | Enable transitions in lockscreen media controllerChet Haase2013-10-042-8/+6
* | | | | | am 3afc7f15: am 9edb7741: am 4c76fdd8: Merge "Fix build." into klp-devEino-Ville Talvala2013-10-041-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9edb7741: am 4c76fdd8: Merge "Fix build." into klp-devEino-Ville Talvala2013-10-041-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix build." into klp-devEino-Ville Talvala2013-10-041-1/+1
| | |\ \ \ \
| | | * | | | Fix build.Eino-Ville Talvala2013-10-041-1/+1
* | | | | | | am eef7e31c: am 079320a2: am 3f48f6aa: Merge "Camera2: Verbosity is verboten....Eino-Ville Talvala2013-10-041-7/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 079320a2: am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-devEino-Ville Talvala2013-10-041-7/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Camera2: Verbosity is verboten." into klp-devEino-Ville Talvala2013-10-041-7/+15
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Camera2: Verbosity is verboten.Eino-Ville Talvala2013-10-041-7/+15
| | | | |/ / | | | |/| |
* | | | | | am 280d250c: am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashc...Chet Haase2013-10-042-16/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spanna...Chet Haase2013-10-042-16/+32
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix infinite recursion in hashcode of Spannables" into klp-devChet Haase2013-10-042-16/+32
| | |\ \ \ \
| | | * | | | Fix infinite recursion in hashcode of SpannablesChet Haase2013-10-042-16/+32
| | | | |/ / | | | |/| |
* | | | | | am 0d9ff161: am 538df343: am 331f9e79: Merge "Print attributes hint not honor...Svetoslav Ganov2013-10-041-2/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 538df343: am 331f9e79: Merge "Print attributes hint not honored." into klp...Svetoslav Ganov2013-10-041-2/+23
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Print attributes hint not honored." into klp-devSvetoslav Ganov2013-10-041-2/+23
| | |\ \ \ \
| | | * | | | Print attributes hint not honored.Svetoslav Ganov2013-10-041-2/+23
| | | | |/ / | | | |/| |
* | | | | | am 6de0ee41: am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in Fast...Alan Viverette2013-10-042-8/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and ...Alan Viverette2013-10-042-8/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-devAlan Viverette2013-10-042-8/+12
| | |\ \ \ \
| | | * | | | Fix font scaling issues in FastScroller and SubtitleViewAlan Viverette2013-10-042-8/+12
* | | | | | | am a488c796: am 2a32771a: am 24871f63: Merge "Fix Text appears on top of exis...Raph Levien2013-10-041-3/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text whe...Raph Levien2013-10-041-3/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix Text appears on top of existing text when composing in gmail." int...Raph Levien2013-10-041-3/+5
| | |\ \ \ \ \
| | | * | | | | Fix Text appears on top of existing text when composing in gmail.Raph Levien2013-10-031-3/+5
* | | | | | | | am 43fac87f: am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is ...Jeff Sharkey2013-10-041-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." int...Jeff Sharkey2013-10-041-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Avoid NPE when ProviderInfo is missing." into klp-devJeff Sharkey2013-10-041-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Avoid NPE when ProviderInfo is missing.Jeff Sharkey2013-10-041-1/+1
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-10-0457-647/+479
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0457-647/+479
* | | | | | | | | | am 849ef427: am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into k...Alex Ray2013-10-041-0/+8
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-devAlex Ray2013-10-041-0/+8
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Add Consumer IR feature" into klp-devAlex Ray2013-10-041-0/+8
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add Consumer IR featureAlex Ray2013-10-031-0/+8
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0436-178/+126
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0436-178/+126
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
* | | | | | | | | | | am 72566b98: am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wi...Robert Greenwalt2013-10-043-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country co...Robert Greenwalt2013-10-043-5/+7
| |\ \ \ \ \ \ \ \ \ \