summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Reconcile api/11.xml with honeycomb-plus-aosp to fix build.Nick Pelly2011-02-011-60/+34
* Really get the new GB APIs.Jean-Baptiste Queru2011-02-012-120/+68
* am 1d04981f: am f7176dfb: am 113834c5: Commit the final API for level 10.Jeff Hamilton2011-01-311-0/+2128
|\
| * am f7176dfb: am 113834c5: Commit the final API for level 10.Jeff Hamilton2011-01-311-0/+2128
| |\
| | * am 113834c5: Commit the final API for level 10.Jeff Hamilton2011-01-311-0/+2128
| | |\
| | | * Commit the final API for level 10.Jeff Hamilton2011-01-311-0/+2128
* | | | am 97510f6a: am 260c3c77: Fix issue #3381489: IllegalStateException: attempt ...Dianne Hackborn2011-01-302-26/+66
|\ \ \ \ | |/ / /
| * | | Fix issue #3381489: IllegalStateException: attempt to re-open...Dianne Hackborn2011-01-302-26/+66
* | | | am 9e3754ff: am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into ...Dianne Hackborn2011-01-301-1/+1549
|\ \ \ \ | |/ / /
| * | | Fix issue #3404571: Commit final APIsDianne Hackborn2011-01-301-1/+1549
| * | | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-301-0/+1382
| |\ \ \
| | * \ \ Merge d350dc04 from gingerbreadJean-Baptiste Queru2011-01-291-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge eab0e97b from gingerbreadJean-Baptiste Queru2011-01-291-10/+21
| | |\ \ \
| | * \ \ \ Merge f126ad3b from gingerbreadJean-Baptiste Queru2011-01-291-14/+5
| | |\ \ \ \
| | * \ \ \ \ Merge c896d85c from gingerbreadJean-Baptiste Queru2011-01-291-0/+4
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge da01b4ab from gingerbreadJean-Baptiste Queru2011-01-291-81/+43
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ resolved conflicts for merge of dc54a8c7 to honeycomb-mergeJeff Hamilton2011-01-281-137/+129
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ resolved conflicts for merge of b7d6ffd7 to honeycomb-mergeNick Pelly2011-01-271-0/+31
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ resolved conflicts for merge of a701cf85 to honeycomb-mergeNick Pelly2011-01-271-0/+13
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 0716ea14 to honeycomb-mergeJeff Hamilton2011-01-271-201/+82
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 3a223404 to honeycomb-mergeJeff Hamilton2011-01-271-0/+28
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 52d3203e to honeycomb-mergeJeff Hamilton2011-01-261-0/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of ca36d863 to honeycomb-mergeJeff Hamilton2011-01-261-11/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of d64d711d to honeycomb-mergeNick Pelly2011-01-251-15/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 0aea1836 to honeycomb-mergeJeff Hamilton2011-01-251-0/+1433
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 34afc2cd from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am d350dc04: Merge "API: Make close() throw an IOException." into gingerbreadNick Pelly2011-01-271-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | API: Make close() throw an IOException.Nick Pelly2011-01-271-0/+6
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 7d4b7dab: Merge 55e124c4 from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-10/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge 55e124c4 from gingerbread-plus-aospJean-Baptiste Queru2011-01-291-10/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbreadNick Pelly2011-01-271-10/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Clean up MifareUltralight API.Nick Pelly2011-01-271-10/+21
| | * | | | | | | | | | | | | | | | am c33acae9: Merge "Fix the build, proper current.xml." into gingerbreadJeff Hamilton2011-01-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Fix the build, proper current.xml.Jeff Hamilton2011-01-251-1/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Enable global (cross-application) drag/drop"Christopher Tate2011-01-281-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Enable global (cross-application) drag/dropChristopher Tate2011-01-281-0/+11
* | | | | | | | | | | | | | | | | | am 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text s...Adam Powell2011-01-281-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" int...Adam Powell2011-01-281-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycombAdam Powell2011-01-281-0/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Fix bug 3399992 - Make ActionBar menu text styleableAdam Powell2011-01-281-0/+22
* | | | | | | | | | | | | | | | | | | am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visi...Joe Onorato2011-01-281-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not th...Joe Onorato2011-01-281-0/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "Plumb whether an input view is actually visible or not through from th...Joe Onorato2011-01-281-0/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Plumb whether an input view is actually visible or not through from the IMEJoe Onorato2011-01-271-1/+58
* | | | | | | | | | | | | | | | | | am 6a11185b: am c8c3021a: Merge "Fix issue #3398767: Need translucent holo th...Dianne Hackborn2011-01-271-0/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into hon...Dianne Hackborn2011-01-271-1/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "Fix issue #3398767: Need translucent holo theme" into honeycombDianne Hackborn2011-01-271-1/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fix issue #3398767: Need translucent holo themeDianne Hackborn2011-01-271-1/+56
* | | | | | | | | | | | | | | | | | Merge "Add support for synchronous bulk USB transfers"Mike Lockwood2011-01-271-23/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \