summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 06a8ceac to masterDianne Hackborn2011-05-191-0/+3
|\
| * am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-0/+32
| |\
| | * Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-0/+32
| * | am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for ...Chet Haase2011-05-191-0/+19
| |\ \ | | |/
| | * Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into ho...Chet Haase2011-05-191-0/+19
| | |\
| | | * DO NOT MERGE: Add custom fragment anims for popping backstackChet Haase2011-05-191-0/+19
* | | | Merge "expandGroup can now animate"John Reck2011-05-191-0/+1
|\ \ \ \
| * | | | expandGroup can now animateJohn Reck2011-05-191-0/+1
* | | | | Merge "Publish setLocation() method as a public Java API"James Dong2011-05-191-0/+1
|\ \ \ \ \
| * | | | | Publish setLocation() method as a public Java APIJames Dong2011-05-181-0/+1
| |/ / / /
* | | | | resolved conflicts for merge of c1730dcf to masterMike Lockwood2011-05-191-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-191-0/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-191-0/+11
| | | |/ | | |/|
* | | | Merge 111d17ceJean-Baptiste Queru2011-05-191-0/+1
|\ \ \ \ | |/ / /
| * | | Merge 4b999030Jean-Baptiste Queru2011-05-181-0/+11
| |\ \ \
| | * \ \ Merge "support humidity sensor type"Jean-Baptiste Queru2011-05-181-0/+11
| | |\ \ \
| | | * | | support humidity sensor typeUrs Fleisch2011-04-131-0/+11
| * | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...Dianne Hackborn2011-05-161-4/+132
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | DO NOT MERGE. Integrate from master: Rework display size access.Dianne Hackborn2011-05-161-4/+132
| * | | | | am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improv...Dianne Hackborn2011-05-161-0/+47
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.Dianne Hackborn2011-05-131-0/+47
| * | | | | am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bun...Dianne Hackborn2011-05-131-12/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.Dianne Hackborn2011-05-131-12/+12
| * | | | | am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from ...Dianne Hackborn2011-05-131-0/+41
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE. Integrate fragment work from masterDianne Hackborn2011-05-131-0/+41
| * | | | | am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen widt...Dianne Hackborn2011-05-131-0/+53
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-121-0/+53
* | | | | | Fixing my build fixSvetoslav Ganov2011-05-182-2/+1
* | | | | | Fixing the buildSvetoslav Ganov2011-05-181-1/+2
| |_|_|_|/ |/| | | |
* | | | | Merge "View horizontalDirection public attribute resolution to an internal var."Fabrice Di Meglio2011-05-171-0/+1
|\ \ \ \ \
| * | | | | View horizontalDirection public attribute resolution to an internal var.Cibu Johny2011-05-161-0/+1
* | | | | | Pass synthesis request params through to the TTS service.Narayan Kamath2011-05-171-1/+2
* | | | | | Fix the build.Jim Miller2011-05-161-1/+1
* | | | | | Merge "Adding horizontalDirection public attribute for View."Fabrice Di Meglio2011-05-161-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Adding horizontalDirection public attribute for View.Cibu Johny2011-05-161-0/+1
* | | | | | Add Socket tagging for granular data accounting.Jeff Sharkey2011-05-131-0/+4
* | | | | | Merge "Factored out the Accessibility vertical initialization."Svetoslav Ganov2011-05-131-0/+1
|\ \ \ \ \ \
| * | | | | | Factored out the Accessibility vertical initialization.Svetoslav Ganov2011-05-131-0/+1
* | | | | | | Merge "Add initial API for stylus and mouse buttons."Jeff Brown2011-05-131-1/+29
|\ \ \ \ \ \ \
| * | | | | | | Add initial API for stylus and mouse buttons.Jeff Brown2011-05-131-1/+29
* | | | | | | | resolved conflicts for merge of ec85619f to masterDianne Hackborn2011-05-123-0/+462057
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | am d46849a5: am a8138732: MR2 is going to be API 13.Dianne Hackborn2011-05-122-0/+462067
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | MR2 is going to be API 13.Dianne Hackborn2011-05-122-0/+462067
| * | | | | | Merged "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-291-0/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Merge "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-291-0/+11
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Adjust mBiggerTouchSlopSquare to the suitable valueMasanori Ogino2011-02-071-0/+11
| | * | | | am cbf0983e: Merge "Final final final Gingerbread MR API changes." into ginge...Nick Pelly2011-02-012-120/+68
| | |\ \ \ \
| | | * | | | Final final final Gingerbread MR API changes.Nick Pelly2011-02-012-120/+68
* | | | | | | Add a method to create ParcelFileDescriptors from DatagramSockets.Chia-chi Yeh2011-05-121-0/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Full local backup infrastructureChristopher Tate2011-05-101-0/+1