summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Add percentilesJohn Reck2015-03-062-1/+27
* | | | | | | | | | | Merge "Annotate ARGB integer parameters with @ColorInt"Tor Norbye2015-03-0625-62/+132
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Annotate ARGB integer parameters with @ColorIntTor Norbye2015-03-0525-62/+132
* | | | | | | | | | | | Merge "Additional annotations: @CallSuper, @Keep, etc."Tor Norbye2015-03-066-0/+289
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | / / / / / / / / | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Additional annotations: @CallSuper, @Keep, etc.Tor Norbye2015-03-056-0/+289
* | | | | | | | | | | Merge "Don't back up / restore the code_cache/ directory"Christopher Tate2015-03-061-2/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't back up / restore the code_cache/ directoryChristopher Tate2015-03-051-2/+9
* | | | | | | | | | | | SkPorterDuff Multiply mode maps to SkXfermode modulate.Derek Sollenberger2015-03-062-6/+3
* | | | | | | | | | | | Merge "Allow attrs to be @Nullable in TextView and LinearLayout"Scott Kennedy2015-03-062-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow attrs to be @Nullable in TextView and LinearLayoutScott Kennedy2015-03-052-6/+8
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Avoid invalid shader creation for certain blend modes"Chris Craik2015-03-061-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid invalid shader creation for certain blend modesChris Craik2015-03-061-1/+4
* | | | | | | | | | | | | Merge "Revert "Revert "Remove references to SkPorterDuff as it is deprecated."""Chris Craik2015-03-065-23/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Revert "Remove references to SkPorterDuff as it is deprecated.""Chris Craik2015-03-065-23/+40
* | | | | | | | | | | | | | Merge "Revert "Remove references to SkPorterDuff as it is deprecated.""Chris Craik2015-03-065-40/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Revert "Remove references to SkPorterDuff as it is deprecated."Chris Craik2015-03-065-40/+23
* | | | | | | | | | | | | | Merge "Deprecate things that rely on Debug.startAllocCounting."Hiroshi Yamauchi2015-03-064-49/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Deprecate things that rely on Debug.startAllocCounting.Hiroshi Yamauchi2015-03-054-50/+122
* | | | | | | | | | | | | | | Merge "Fix typo in WebSettings javadoc."Torne (Richard Coles)2015-03-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix typo in WebSettings javadoc.Torne (Richard Coles)2015-03-061-2/+2
* | | | | | | | | | | | | | | | Merge "Fix USB typos"Glenn Kasten2015-03-062-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix USB typosGlenn Kasten2015-03-052-5/+5
* | | | | | | | | | | | | | | | | Merge "Support undo of some programmatic TextView changes"James Cook2015-03-062-46/+160
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Support undo of some programmatic TextView changesJames Cook2015-03-032-46/+160
* | | | | | | | | | | | | | | | | | Provide better error reporting for WebViewMikhail Naganov2015-03-066-29/+202
* | | | | | | | | | | | | | | | | | Merge "media: update AMessage to use handler instead of handler-id"Lajos Molnar2015-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | media: update AMessage to use handler instead of handler-idLajos Molnar2015-03-041-1/+1
* | | | | | | | | | | | | | | | | | | Merge "Mark setAccessibilityDelegate()'s argument as @Nullable"Scott Kennedy2015-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Mark setAccessibilityDelegate()'s argument as @NullableScott Kennedy2015-03-051-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Don't enqueue allowBackup=false apps for full backup attempts"Christopher Tate2015-03-062-11/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Don't enqueue allowBackup=false apps for full backup attemptsChristopher Tate2015-03-052-11/+58
* | | | | | | | | | | | | | | | | | | Merge "Add methods for device telephony configs."Andrew Lee2015-03-064-1/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add methods for device telephony configs.Andrew Lee2015-03-044-1/+47
* | | | | | | | | | | | | | | | | | | | am eef3fbcf: am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on ...Dan Sandler2015-03-062-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when ...Dan Sandler2015-03-062-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbid...Dan Sandler2015-03-062-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen ...Dan Sandler2015-03-062-1/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Avoid crashing on startup when policy forbids lockscreen camera." into...Dan Sandler2015-03-062-1/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Avoid crashing on startup when policy forbids lockscreen camera.Dan Sandler2015-03-032-1/+15
* | | | | | | | | | | | | | | | | | | | | | | am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-a...Dan Albert2015-03-053-26/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge "Stop using namespace std."Dan Albert2015-03-053-26/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Stop using namespace std.Dan Albert2015-03-043-26/+19
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup Bitmap JNI attempt #2"John Reck2015-03-0522-181/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-0522-181/+113
* | | | | | | | | | | | | | | | | | | | | | | | am dcfa5e03: am 6e3c763f: am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14:...Eric Gilmore2015-03-051-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 6e3c763f: am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27:...Eric Gilmore2015-03-051-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fi...Eric Gilmore2015-03-051-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, an...Eric Gilmore2015-03-051-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |