Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reconcile api/11.xml with honeycomb-plus-aosp to fix build. | Nick Pelly | 2011-02-01 | 1 | -60/+34 |
* | Really get the new GB APIs. | Jean-Baptiste Queru | 2011-02-01 | 2 | -120/+68 |
* | am 1d04981f: am f7176dfb: am 113834c5: Commit the final API for level 10. | Jeff Hamilton | 2011-01-31 | 1 | -0/+2128 |
|\ | |||||
| * | am f7176dfb: am 113834c5: Commit the final API for level 10. | Jeff Hamilton | 2011-01-31 | 1 | -0/+2128 |
| |\ | |||||
| | * | am 113834c5: Commit the final API for level 10. | Jeff Hamilton | 2011-01-31 | 1 | -0/+2128 |
| | |\ | |||||
| | | * | Commit the final API for level 10. | Jeff Hamilton | 2011-01-31 | 1 | -0/+2128 |
* | | | | am 97510f6a: am 260c3c77: Fix issue #3381489: IllegalStateException: attempt ... | Dianne Hackborn | 2011-01-30 | 2 | -26/+66 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix issue #3381489: IllegalStateException: attempt to re-open... | Dianne Hackborn | 2011-01-30 | 2 | -26/+66 |
* | | | | am 9e3754ff: am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into ... | Dianne Hackborn | 2011-01-30 | 1 | -1/+1549 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix issue #3404571: Commit final APIs | Dianne Hackborn | 2011-01-30 | 1 | -1/+1549 |
| * | | | Mass merge from gingerbread - do not merge | The Android Open Source Project | 2011-01-30 | 1 | -0/+1382 |
| |\ \ \ | |||||
| | * \ \ | Merge d350dc04 from gingerbread | Jean-Baptiste Queru | 2011-01-29 | 1 | -0/+6 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge eab0e97b from gingerbread | Jean-Baptiste Queru | 2011-01-29 | 1 | -10/+21 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge f126ad3b from gingerbread | Jean-Baptiste Queru | 2011-01-29 | 1 | -14/+5 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge c896d85c from gingerbread | Jean-Baptiste Queru | 2011-01-29 | 1 | -0/+4 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge da01b4ab from gingerbread | Jean-Baptiste Queru | 2011-01-29 | 1 | -81/+43 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | resolved conflicts for merge of dc54a8c7 to honeycomb-merge | Jeff Hamilton | 2011-01-28 | 1 | -137/+129 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | resolved conflicts for merge of b7d6ffd7 to honeycomb-merge | Nick Pelly | 2011-01-27 | 1 | -0/+31 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | resolved conflicts for merge of a701cf85 to honeycomb-merge | Nick Pelly | 2011-01-27 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 0716ea14 to honeycomb-merge | Jeff Hamilton | 2011-01-27 | 1 | -201/+82 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 3a223404 to honeycomb-merge | Jeff Hamilton | 2011-01-27 | 1 | -0/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 52d3203e to honeycomb-merge | Jeff Hamilton | 2011-01-26 | 1 | -0/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of ca36d863 to honeycomb-merge | Jeff Hamilton | 2011-01-26 | 1 | -11/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of d64d711d to honeycomb-merge | Nick Pelly | 2011-01-25 | 1 | -15/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 0aea1836 to honeycomb-merge | Jeff Hamilton | 2011-01-25 | 1 | -0/+1433 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp | Jean-Baptiste Queru | 2011-01-29 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 34afc2cd from gingerbread-plus-aosp | Jean-Baptiste Queru | 2011-01-29 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread | Nick Pelly | 2011-01-27 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | API: Make close() throw an IOException. | Nick Pelly | 2011-01-27 | 1 | -0/+6 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | am 7d4b7dab: Merge 55e124c4 from gingerbread-plus-aosp | Jean-Baptiste Queru | 2011-01-29 | 1 | -10/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Merge 55e124c4 from gingerbread-plus-aosp | Jean-Baptiste Queru | 2011-01-29 | 1 | -10/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread | Nick Pelly | 2011-01-27 | 1 | -10/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | Clean up MifareUltralight API. | Nick Pelly | 2011-01-27 | 1 | -10/+21 |
| | * | | | | | | | | | | | | | | | | am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread | Jeff Hamilton | 2011-01-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | Fix the build, proper current.xml. | Jeff Hamilton | 2011-01-25 | 1 | -1/+1 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge "Enable global (cross-application) drag/drop" | Christopher Tate | 2011-01-28 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Enable global (cross-application) drag/drop | Christopher Tate | 2011-01-28 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | | | am 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text s... | Adam Powell | 2011-01-28 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" int... | Adam Powell | 2011-01-28 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb | Adam Powell | 2011-01-28 | 1 | -0/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | Fix bug 3399992 - Make ActionBar menu text styleable | Adam Powell | 2011-01-28 | 1 | -0/+22 |
* | | | | | | | | | | | | | | | | | | | am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visi... | Joe Onorato | 2011-01-28 | 1 | -0/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not th... | Joe Onorato | 2011-01-28 | 1 | -0/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Merge "Plumb whether an input view is actually visible or not through from th... | Joe Onorato | 2011-01-28 | 1 | -0/+57 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Plumb whether an input view is actually visible or not through from the IME | Joe Onorato | 2011-01-27 | 1 | -1/+58 |
* | | | | | | | | | | | | | | | | | | am 6a11185b: am c8c3021a: Merge "Fix issue #3398767: Need translucent holo th... | Dianne Hackborn | 2011-01-27 | 1 | -0/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into hon... | Dianne Hackborn | 2011-01-27 | 1 | -1/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb | Dianne Hackborn | 2011-01-27 | 1 | -1/+56 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Fix issue #3398767: Need translucent holo theme | Dianne Hackborn | 2011-01-27 | 1 | -1/+56 |
* | | | | | | | | | | | | | | | | | | Merge "Add support for synchronous bulk USB transfers" | Mike Lockwood | 2011-01-27 | 1 | -23/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |