summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 2a36a778 to masterHung-ying Tyan2010-09-286-6/+9
|\
| * am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." in...Hung-ying Tyan2010-09-276-16/+9
| |\
| | * Merge "Move SipService out of SystemServer to phone process." into gingerbreadHung-ying Tyan2010-09-276-16/+9
| | |\
| | | * Move SipService out of SystemServer to phone process.Hung-ying Tyan2010-09-286-16/+9
* | | | am 4e9243d5: (-s ours) am 8d7057df: Merge "Updated assets in status bar. DO N...Gilles Debunne2010-09-270-0/+0
|\ \ \ \ | |/ / /
| * | | am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerb...Gilles Debunne2010-09-2772-0/+0
| |\ \ \ | | |/ /
| | * | Merge "Updated assets in status bar. DO NOT MERGE." into gingerbreadGilles Debunne2010-09-2772-0/+0
| | |\ \
| | | * | Updated assets in status bar. DO NOT MERGE.Gilles Debunne2010-09-2772-0/+0
* | | | | am d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into /...Nick Kralevich2010-09-271-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" i...Nick Kralevich2010-09-271-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "squeeze a few more bits of randomness into /dev/random" into gingerbreadNick Kralevich2010-09-271-0/+1
| | |\ \ \
| | | * | | squeeze a few more bits of randomness into /dev/randomNick Kralevich2010-09-271-0/+1
* | | | | | am 55ee8f93: am 44e8ff99: Adding a new intent to allow for apps (Launcher) to...Winson Chung2010-09-272-0/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the ...Winson Chung2010-09-272-0/+25
| |\ \ \ \ \ | | |/ / / /
| | * | | | Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab ...Winson Chung2010-09-272-0/+25
* | | | | | am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from tran...Eric Fischer2010-09-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE...Eric Fischer2010-09-2721-10/+90
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into ginger...Eric Fischer2010-09-2721-10/+90
| | |\ \ \ \
| | | * | | | Trim unwanted whitespace from translations. DO NOT MERGEEric Fischer2010-09-2721-10/+90
| | | | |_|/ | | | |/| |
* | | | | | am 63555e36: (-s ours) am 0ba5b647: Merge "Revert previous status bar assets....Gilles Debunne2010-09-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gi...Gilles Debunne2010-09-274-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbreadGilles Debunne2010-09-274-0/+0
| | |\ \ \ \
| | | * | | | Revert previous status bar assets. DO NOT MERGE.Gilles Debunne2010-09-274-0/+0
| | | | |_|/ | | | |/| |
* | | | | | am d4f1436d: (-s ours) am 143e6109: DO NOT MERGE Clarify the explanation of A...Chris Palmer2010-09-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.Chris Palmer2010-09-271-34/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE Clarify the explanation of Android's security design.Chris Palmer2010-09-271-34/+42
* | | | | | resolved conflicts for merge of 191a25e1 to masterWu-cheng Li2010-09-272-6/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 83ea6389: Merge "The old overlay should be destroyed if orientation change...Wu-cheng Li2010-09-272-6/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "The old overlay should be destroyed if orientation changes." into ging...Wu-cheng Li2010-09-272-6/+16
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | The old overlay should be destroyed if orientation changes.Wu-cheng Li2010-09-272-6/+16
* | | | | | am e7dd4e38: am 04a426f5: Merge "Use buffered I/O during certificate parsing"...Kenny Root2010-09-271-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerb...Kenny Root2010-09-271-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Use buffered I/O during certificate parsing" into gingerbreadKenny Root2010-09-271-1/+2
| | |\ \ \ \
| | | * | | | Use buffered I/O during certificate parsingKenny Root2010-09-271-1/+2
* | | | | | | resolved conflicts for merge of a8bce7c8 to masterDianne Hackborn2010-09-271-4/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into g...Dianne Hackborn2010-09-2710-26/+161
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Allow all apps to call ContentResolver.getType()." into gingerbreadDianne Hackborn2010-09-2710-26/+161
| | |\ \ \ \ \
| | | * | | | | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-2610-26/+161
* | | | | | | | Merge "fix this: closing database twice fails with IllegalStateException"Vasu Nori2010-09-273-12/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | fix this: closing database twice fails with IllegalStateExceptionVasu Nori2010-09-273-12/+19
* | | | | | | | | Merge "work on review comments and code formating. Removed white spaces"Dharmaray Kundargi2010-09-272-12/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | work on review comments and code formating.Dharmaray Kundargi2010-09-272-12/+53
* | | | | | | | | | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-2710-26/+162
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Holo themes and assets in progressAdam Powell2010-09-27311-27/+1779
|/ / / / / / / /
* | | | | | | | Merge "use hostname when address null ProxyProperties parcelling"Irfan Sheriff2010-09-271-9/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | use hostname when address null ProxyProperties parcellingIrfan Sheriff2010-09-271-9/+21
* | | | | | | | | Merge "Add support for transferring touch focus."Jeff Brown2010-09-274-0/+121
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add support for transferring touch focus.Jeff Brown2010-09-274-0/+121
* | | | | | | | | | Merge "Don't show X for notifications that can't be cleared"Joe Onorato2010-09-274-14/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't show X for notifications that can't be clearedJoe Onorato2010-09-274-14/+20
generated by cgit v1.1 at 2024-09-17 10:42:44 +0000