Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Adds CookieManager methods to configure policy for cookies for file sc... | Steve Block | 2011-02-10 | 1 | -0/+24 |
|\ | |||||
| * | Adds CookieManager methods to configure policy for cookies for file scheme URLs | Kristian Monsen | 2010-12-21 | 1 | -0/+24 |
* | | Bug 3438513 Fix incorrect throws clause | Glenn Kasten | 2011-02-09 | 1 | -0/+2 |
* | | Expose several useful Bitmap APIs. | Romain Guy | 2011-02-08 | 1 | -0/+37 |
* | | New LRU cache class. | Jesse Wilson | 2011-02-07 | 1 | -1/+190 |
* | | am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a d... | Vasu Nori | 2011-02-03 | 1 | -11/+0 |
|\ \ | |||||
| * | | Revert "Merge "bug:3414192 new API to designate a download to be OTA update" ... | Vasu Nori | 2011-02-03 | 1 | -11/+0 |
* | | | Unhide MediaStore.getVersion so Music2 can use it. | Marco Nelissen | 2011-02-03 | 1 | -0/+13 |
* | | | Merge changes I80558c62,I6587f580 | Mike Lockwood | 2011-02-03 | 1 | -1/+12 |
|\ \ \ | |||||
| * | | | UsbService: Blacklist HID boot subclass devices (keyboards and mice) | Mike Lockwood | 2011-02-01 | 1 | -1/+12 |
* | | | | am 99e8e047: am 6bc710f7: Merge "bug:3414192 new API to designate a download ... | Vasu Nori | 2011-02-02 | 1 | -0/+11 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | bug:3414192 new API to designate a download to be OTA update | Vasu Nori | 2011-02-02 | 1 | -0/+11 |
| * | | | DO NOT MERGE | Nick Pelly | 2011-02-01 | 1 | -60/+34 |
* | | | | Really get the new GB APIs. | Jean-Baptiste Queru | 2011-02-01 | 1 | -60/+34 |
| |/ / |/| | | |||||
* | | | am 97510f6a: am 260c3c77: Fix issue #3381489: IllegalStateException: attempt ... | Dianne Hackborn | 2011-01-30 | 1 | -13/+33 |
|\ \ \ | |/ / | |||||
| * | | Fix issue #3381489: IllegalStateException: attempt to re-open... | Dianne Hackborn | 2011-01-30 | 1 | -13/+33 |
| * | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |