summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add badging of Payment appsAdam Lesinski2013-09-271-11/+142
* Add support for dumping new badgingAdam Lesinski2013-09-271-3/+68
* Merge "Page ranges not correct in come cases." into klp-devSvetoslav2013-09-231-38/+47
|\
| * Page ranges not correct in come cases.Svetoslav2013-09-211-38/+47
* | Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-devDianne Hackborn2013-09-234-54/+295
|\ \
| * | Issue #10461551: KLP API Review: AppOpsManagerDianne Hackborn2013-09-234-54/+295
* | | Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-devDianne Hackborn2013-09-224-18/+33
|\ \ \
| * | | Debug issue #10876433 java.lang.IllegalStateException...Dianne Hackborn2013-09-224-18/+33
| |/ /
* | | Merge "Latest UX asset drop, grid padding." into klp-devJeff Sharkey2013-09-22195-66/+69
|\ \ \
| * | | Latest UX asset drop, grid padding.Jeff Sharkey2013-09-21195-66/+69
* | | | Merge "Create unique files, root ordering, UI bugs." into klp-devJeff Sharkey2013-09-2211-54/+104
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Create unique files, root ordering, UI bugs.Jeff Sharkey2013-09-2111-54/+104
* | | Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-devIgor Murashkin2013-09-2210-85/+92
|\ \ \
| * | | camera2: Rename CameraProperties to CameraCharacteristicsIgor Murashkin2013-09-2110-85/+92
* | | | Merge "Fix BatchScan request coalesing" into klp-devRobert Greenwalt2013-09-222-23/+51
|\ \ \ \ | |/ / / |/| | |
| * | | Fix BatchScan request coalesingRobert Greenwalt2013-09-202-23/+51
* | | | Merge "camera2: Add capture sequences and capture failures" into klp-devIgor Murashkin2013-09-226-33/+338
|\ \ \ \
| * | | | camera2: Add capture sequences and capture failuresIgor Murashkin2013-09-206-33/+338
* | | | | Merge commit '53221120' into fix-merge-conflictWink Saville2013-09-211-2/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetw...Wink Saville2013-09-211-2/+4
| |\ \ \ \
| | * \ \ \ am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)Wink Saville2013-09-211-2/+4
| | |\ \ \ \
| | | * | | | Do not always call setIsConnectedToProvisioningNetwork(false)Wink Saville2013-09-211-2/+4
* | | | | | | Merge "WebView: add an API method to control web contents debugging" into klp...Jonathan Dixon2013-09-214-0/+28
|\ \ \ \ \ \ \
| * | | | | | | WebView: add an API method to control web contents debuggingMikhail Naganov2013-09-114-0/+28
* | | | | | | | Merge "Update android.print.PrintAttributes documentation" into klp-devSvetoslav Ganov2013-09-211-14/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Update android.print.PrintAttributes documentationSvetoslav Ganov2013-09-191-14/+34
* | | | | | | | | am 22423446: am 217683d9: am e1243728: Merge "Fixed typo: Added missing word....David Friedman2013-09-201-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 217683d9: am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080...David Friedman2013-09-201-2/+2
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am e1243728: Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:"...David Friedman2013-09-201-2/+2
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-...David Friedman2013-09-211-2/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixed typo: Added missing word.David Friedman2013-09-201-2/+2
* | | | | | | | | | | Merge "Fix issue #10863270: procstats UI is showing all green" into klp-devDianne Hackborn2013-09-212-11/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue #10863270: procstats UI is showing all greenDianne Hackborn2013-09-202-11/+2
* | | | | | | | | | | | Merge "Shut. Up." into klp-devDianne Hackborn2013-09-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Shut. Up.Dianne Hackborn2013-09-201-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Fix issue #10807048: Groupon: The application crash when user rotates...Dianne Hackborn2013-09-212-10/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix issue #10807048: Groupon: The application crash when user rotates...Dianne Hackborn2013-09-202-10/+56
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Offer to enable a print service after it is installed." into klp-devSvetoslav2013-09-219-245/+334
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Offer to enable a print service after it is installed.Svetoslav2013-09-209-245/+334
* | | | | | | | | | | | | Merge "Correct bitmap merging logic" into klp-devChris Craik2013-09-215-13/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Correct bitmap merging logicChris Craik2013-09-205-13/+8
* | | | | | | | | | | | | Merge "Fix for "Can't place cursor after combining accent"" into klp-devRaph Levien2013-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix for "Can't place cursor after combining accent"Raph Levien2013-09-201-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "camera2: Add more camera device states, make #openCamera async." into ...Igor Murashkin2013-09-205-97/+370
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | camera2: Add more camera device states, make #openCamera async.Igor Murashkin2013-09-195-97/+370
* | | | | | | | | | | | | | Merge "Ensure access to the map of geofence callbacks is synchronized in all ...destradaa2013-09-202-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Ensure access to the map of geofence callbacks is synchronized in all casesdestradaa2013-09-202-8/+7
* | | | | | | | | | | | | | | Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-devAdam Lesinski2013-09-205-30/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Surfaces ParcelFileDescriptor#parseMode() as APIAdam Lesinski2013-09-205-30/+37
* | | | | | | | | | | | | | | | Merge "Delegate mkdirs() to vold when lacking perms." into klp-devJeff Sharkey2013-09-204-29/+179
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \