summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am d8cf2125: Merge "Add a way to get a string for an error code." into ginger...Jeff Hamilton2010-10-261-0/+28
|\
| * Add a way to get a string for an error code.Jeff Hamilton2010-10-261-0/+28
* | am 79fb6449: Merge "Make some contructors public but hidden." into gingerbreadJeff Hamilton2010-10-262-2/+4
|\ \ | |/
| * Make some contructors public but hidden.Jeff Hamilton2010-10-262-2/+4
* | am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-10-2520-1313/+973
|\ \ | |/
| * Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-10-2520-1313/+973
| |\
| | * Import revised translations. DO NOT MERGEEric Fischer2010-10-2520-1313/+973
* | | am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbreadJeff Hamilton2010-10-251-0/+1
|\ \ \ | |/ /
| * | Add a RHS status bar slot for NFC.Jeff Hamilton2010-10-251-0/+1
* | | am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test Expand...Adam Powell2010-10-251-1/+3
|\ \ \ | |/ /
| * | Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewB...Adam Powell2010-10-251-1/+3
| |\ \
| | * | DO NOT MERGE Fix bug 3124899 - timeout in CTS testAdam Powell2010-10-251-1/+3
| | |/
* | | am abb50f15: Merge "docs: fix a couple api links" into gingerbreadScott Main2010-10-251-55/+59
|\ \ \ | |/ /
| * | Merge "docs: fix a couple api links" into gingerbreadScott Main2010-10-251-55/+59
| |\ \ | | |/ | |/|
| | * docs: fix a couple api linksScott Main2010-10-211-55/+59
* | | am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into ginger...Nick Pelly2010-10-253-2/+2
|\ \ \ | |/ /
| * | Fixed NdefTag parcelable conversion methods.Sylvain Fonteneau2010-10-253-2/+2
* | | am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into g...Nick Pelly2010-10-241-0/+12
|\ \ \ | |/ /
| * | Merge "Document getPollBytes() and getActivationBytes()." into gingerbreadNick Pelly2010-10-241-0/+12
| |\ \
| | * | Document getPollBytes() and getActivationBytes().Nick Pelly2010-10-241-0/+12
* | | | am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s n...Dianne Hackborn2010-10-242-7/+26
|\ \ \ \ | |/ / /
| * | | Fix issue #3126018: No way to specify NativeActivity's native methodDianne Hackborn2010-10-242-7/+26
* | | | am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into g...Eric Rowe2010-10-221-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Change disable timeout for BT disable stress test" into gingerbreadEric Rowe2010-10-221-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Change disable timeout for BT disable stress testEric Rowe2010-10-221-1/+1
* | | | am 07f3bee2: Push Tag/NdefTag implementation details into the service.Nick Pelly2010-10-225-229/+301
|\ \ \ \ | |/ / /
| * | | Push Tag/NdefTag implementation details into the service.Nick Pelly2010-10-225-229/+301
* | | | am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-10-2220-244/+684
|\ \ \ \ | |/ / /
| * | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-10-2220-244/+684
| |\ \ \
| | * | | Import revised translations. DO NOT MERGEEric Fischer2010-10-2220-244/+684
| | |/ /
* | | | am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen d...Eric Fischer2010-10-221-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Add a space before the weekday in the zh_CN lock screen date format." ...Eric Fischer2010-10-221-2/+2
| |\ \ \
| | * | | Add a space before the weekday in the zh_CN lock screen date format.Eric Fischer2010-10-221-2/+2
| | |/ /
* | | | am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbreadDianne Hackborn2010-10-223-13/+6
|\ \ \ \ | |/ / /
| * | | Fix issue #3122240: Expose xlarge in GB.Dianne Hackborn2010-10-223-13/+6
| |/ /
* | | am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." ...Jeff Hamilton2010-10-222-9/+2
|\ \ \ | |/ /
| * | Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbreadJeff Hamilton2010-10-222-9/+2
| |\ \
| | * | Unhide some NFC APIs that are required for the Tag app.Jeff Hamilton2010-10-212-9/+2
* | | | am 0592832c: Merge "Attempt to fix simulator build." into gingerbreadNick Pelly2010-10-222-0/+4
|\ \ \ \ | |/ / /
| * | | Attempt to fix simulator build.Nick Pelly2010-10-222-0/+4
| |/ /
* | | am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.Jeff Hamilton2010-10-212-0/+41
|\ \ \ | |/ /
| * | Backport ParcelFileDescriptor.createPipe() from master.Jeff Hamilton2010-10-212-0/+41
* | | am ba501785: Merge "Implement issue #3116702: New manifest tags for supported...Dianne Hackborn2010-10-214-0/+49
|\ \ \ | |/ /
| * | Merge "Implement issue #3116702: New manifest tags for supported screen sizes...Dianne Hackborn2010-10-214-0/+49
| |\ \
| | * | Implement issue #3116702: New manifest tags for supported screen sizes DO NO...Dianne Hackborn2010-10-214-0/+49
* | | | am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" i...Dianne Hackborn2010-10-211-2/+32
|\ \ \ \ | |/ / /
| * | | Merge "Fix issue #3117918: No way to finish a native activity" into gingerbreadDianne Hackborn2010-10-211-2/+32
| |\ \ \
| | * | | Fix issue #3117918: No way to finish a native activityDianne Hackborn2010-10-211-2/+32
| | |/ /
* | | | am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into ...Jeff Brown2010-10-211-11/+16
|\ \ \ \ | |/ / /
| * | | Merge "Fix a race condition in wallpaper move throttling." into gingerbreadJeff Brown2010-10-211-11/+16
| |\ \ \