summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | Fix a race condition in wallpaper move throttling.Jeff Brown2010-10-211-11/+16
* | | | am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" i...Dianne Hackborn2010-10-211-12/+5
|\ \ \ \ | |/ / /
| * | | Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbreadDianne Hackborn2010-10-211-12/+5
| |\ \ \
| | * | | Fix issue #3117472: Format storage dialog still brokenDianne Hackborn2010-10-211-12/+5
| | | |/ | | |/|
* | | | am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge...Mathias Agopian2010-10-211-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "Mirror the preview for front-facing cameras. do not merge" into ginger...Mathias Agopian2010-10-211-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Mirror the preview for front-facing cameras. do not mergeWu-cheng Li2010-10-201-3/+3
* | | | am a71354d7: Enable presence check at application level using RawTagConnectio...Sylvain Fonteneau2010-10-212-4/+11
|\ \ \ \ | |/ / /
| * | | Enable presence check at application level usingSylvain Fonteneau2010-10-212-4/+11
* | | | am 7ea5c45e: NFC settings cleanup.Nick Pelly2010-10-212-96/+13
|\ \ \ \ | |/ / /
| * | | NFC settings cleanup.Nick Pelly2010-10-212-96/+13
* | | | am 15358e14: Merge "Make the base direction of the Arabic error pages RTL"Brad Fitzpatrick2010-10-212-2/+2
|\ \ \ \
| * \ \ \ Merge "Make the base direction of the Arabic error pages RTL"Brad Fitzpatrick2010-10-212-2/+2
| |\ \ \ \
| | * | | | Make the base direction of the Arabic error pages RTLShachar Shemesh2010-10-202-2/+2
* | | | | | am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"Brad Fitzpatrick2010-10-212-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Set the base direction of the Hebrew error pages to RTL"Brad Fitzpatrick2010-10-212-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Set the base direction of the Hebrew error pages to RTLShachar Shemesh2010-10-202-2/+2
* | | | | | resolved conflicts for merge of 5d919b43 to gingerbread-plus-aospJean-Baptiste Queru2010-10-201-2/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make disabled TextViews uneditable"Jean-Baptiste Queru2010-10-201-2/+19
| |\ \ \ \ \
| | * | | | | Make disabled TextViews uneditableJanos Levai2010-10-181-2/+19
* | | | | | | am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbreadDianne Hackborn2010-10-201-3/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Fix java doc on FLAG_EXTERNAL." into gingerbreadDianne Hackborn2010-10-201-3/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |