Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of 06a8ceac to master | Dianne Hackborn | 2011-05-19 | 1 | -0/+3 |
|\ | |||||
| * | am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. | Dianne Hackborn | 2011-05-19 | 1 | -0/+32 |
| |\ | |||||
| | * | Add new "-swNNNdp" resource qualifier. | Dianne Hackborn | 2011-05-19 | 1 | -0/+32 |
| * | | am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for ... | Chet Haase | 2011-05-19 | 1 | -0/+19 |
| |\ \ | | |/ | |||||
| | * | Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into ho... | Chet Haase | 2011-05-19 | 1 | -0/+19 |
| | |\ | |||||
| | | * | DO NOT MERGE: Add custom fragment anims for popping backstack | Chet Haase | 2011-05-19 | 1 | -0/+19 |
* | | | | Merge "expandGroup can now animate" | John Reck | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | expandGroup can now animate | John Reck | 2011-05-19 | 1 | -0/+1 |
* | | | | | Merge "Publish setLocation() method as a public Java API" | James Dong | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Publish setLocation() method as a public Java API | James Dong | 2011-05-18 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | resolved conflicts for merge of c1730dcf to master | Mike Lockwood | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors | Mike Lockwood | 2011-05-19 | 1 | -0/+11 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | USB: Add method to access raw USB device descriptors | Mike Lockwood | 2011-05-19 | 1 | -0/+11 |
| | | |/ | | |/| | |||||
* | | | | Merge 111d17ce | Jean-Baptiste Queru | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 4b999030 | Jean-Baptiste Queru | 2011-05-18 | 1 | -0/+11 |
| |\ \ \ | |||||
| | * \ \ | Merge "support humidity sensor type" | Jean-Baptiste Queru | 2011-05-18 | 1 | -0/+11 |
| | |\ \ \ | |||||
| | | * | | | support humidity sensor type | Urs Fleisch | 2011-04-13 | 1 | -0/+11 |
| * | | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework... | Dianne Hackborn | 2011-05-16 | 1 | -4/+132 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | DO NOT MERGE. Integrate from master: Rework display size access. | Dianne Hackborn | 2011-05-16 | 1 | -4/+132 |
| * | | | | | am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improv... | Dianne Hackborn | 2011-05-16 | 1 | -0/+47 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | DO NOT MERGE. Integrate from master: Improve activity manager debug dumps. | Dianne Hackborn | 2011-05-13 | 1 | -0/+47 |
| * | | | | | am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bun... | Dianne Hackborn | 2011-05-13 | 1 | -12/+12 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs. | Dianne Hackborn | 2011-05-13 | 1 | -12/+12 |
| * | | | | | am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from ... | Dianne Hackborn | 2011-05-13 | 1 | -0/+41 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | DO NOT MERGE. Integrate fragment work from master | Dianne Hackborn | 2011-05-13 | 1 | -0/+41 |
| * | | | | | am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen widt... | Dianne Hackborn | 2011-05-13 | 1 | -0/+53 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | DO NOT MERGE. Integrate add new screen width/height in "dp" configs. | Dianne Hackborn | 2011-05-12 | 1 | -0/+53 |
* | | | | | | Fixing my build fix | Svetoslav Ganov | 2011-05-18 | 2 | -2/+1 |
* | | | | | | Fixing the build | Svetoslav Ganov | 2011-05-18 | 1 | -1/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge "View horizontalDirection public attribute resolution to an internal var." | Fabrice Di Meglio | 2011-05-17 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | View horizontalDirection public attribute resolution to an internal var. | Cibu Johny | 2011-05-16 | 1 | -0/+1 |
* | | | | | | Pass synthesis request params through to the TTS service. | Narayan Kamath | 2011-05-17 | 1 | -1/+2 |
* | | | | | | Fix the build. | Jim Miller | 2011-05-16 | 1 | -1/+1 |
* | | | | | | Merge "Adding horizontalDirection public attribute for View." | Fabrice Di Meglio | 2011-05-16 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Adding horizontalDirection public attribute for View. | Cibu Johny | 2011-05-16 | 1 | -0/+1 |
* | | | | | | Add Socket tagging for granular data accounting. | Jeff Sharkey | 2011-05-13 | 1 | -0/+4 |
* | | | | | | Merge "Factored out the Accessibility vertical initialization." | Svetoslav Ganov | 2011-05-13 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Factored out the Accessibility vertical initialization. | Svetoslav Ganov | 2011-05-13 | 1 | -0/+1 |
* | | | | | | | Merge "Add initial API for stylus and mouse buttons." | Jeff Brown | 2011-05-13 | 1 | -1/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add initial API for stylus and mouse buttons. | Jeff Brown | 2011-05-13 | 1 | -1/+29 |
* | | | | | | | | resolved conflicts for merge of ec85619f to master | Dianne Hackborn | 2011-05-12 | 3 | -0/+462057 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | am d46849a5: am a8138732: MR2 is going to be API 13. | Dianne Hackborn | 2011-05-12 | 2 | -0/+462067 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | MR2 is going to be API 13. | Dianne Hackborn | 2011-05-12 | 2 | -0/+462067 |
| * | | | | | | Merged "Adjust mBiggerTouchSlopSquare to the suitable value" | Conley Owens | 2011-04-29 | 1 | -0/+11 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Adjust mBiggerTouchSlopSquare to the suitable value" | Conley Owens | 2011-04-29 | 1 | -0/+11 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Adjust mBiggerTouchSlopSquare to the suitable value | Masanori Ogino | 2011-02-07 | 1 | -0/+11 |
| | * | | | | am cbf0983e: Merge "Final final final Gingerbread MR API changes." into ginge... | Nick Pelly | 2011-02-01 | 2 | -120/+68 |
| | |\ \ \ \ | |||||
| | | * | | | | Final final final Gingerbread MR API changes. | Nick Pelly | 2011-02-01 | 2 | -120/+68 |
* | | | | | | | Add a method to create ParcelFileDescriptors from DatagramSockets. | Chia-chi Yeh | 2011-05-12 | 1 | -0/+1 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Full local backup infrastructure | Christopher Tate | 2011-05-10 | 1 | -0/+1 |