summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge cafdea61a85c8f5d0646cc9413a09346c637f43f w/ one minor conflict in core/...The Android Open Source Project2009-06-142-67/+77
|\
| * Fixes #1914574. An NPE could be causes in lists by ViewGroup.dispatchDraw().Romain Guy2009-06-122-70/+72
* | am 763a5723: Hide gestures API.Romain Guy2009-06-142-1688/+5
|\ \ | |/
| * Hide gestures API.Romain Guy2009-06-122-1689/+6
* | am e8939bb8: resolved conflicts for merge of a798dd86 to donutRamanan Rajeswaran2009-06-141-0/+4
|\ \ | |/
| * resolved conflicts for merge of a798dd86 to donutRamanan Rajeswaran2009-06-121-0/+4
| |\
| | * AI 149797: Have SetupWizard pull the Terms of Service from the web using a ne...Ramanan Rajeswaran2009-06-111-1/+12
* | | am 3d4b7065: Merge change 4047 into donutAndroid (Google) Code Review2009-06-121-18/+35
|\ \ \ | |/ /
| * | Merge change 4047 into donutAndroid (Google) Code Review2009-06-121-18/+35
| |\ \
| | * | Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes corre...Eric Laurent2009-06-121-18/+35
* | | | am d670b8c6: Merge change 3981 into donutAndroid (Google) Code Review2009-06-127-190/+187
|\ \ \ \ | |/ / /
| * | | Merge change 3981 into donutAndroid (Google) Code Review2009-06-127-190/+187
| |\ \ \
| | * | | Removed trailing whitespaces.Nicolas Catania2009-06-117-190/+187
* | | | | Merge change 3618Android (Google) Code Review2009-06-121-0/+33
|\ \ \ \ \
| * | | | | Fix bug 1875344 cut 2: adding option to show/noshow away presence when device...Ye Wen2009-06-091-0/+33
* | | | | | am 83bb56c3: Merge change 3424 into donutAndroid (Google) Code Review2009-06-1220-77/+1653
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge change 3424 into donutAndroid (Google) Code Review2009-06-1220-77/+1653
| |\ \ \ \ \
| | * | | | | Add the VPN services package, VPN service base classes and L2tpIpsecService.Hung-ying Tyan2009-06-1220-77/+1653
| | | |_|/ / | | |/| | |
* | | | | | am 7f50c08f: Show proper suggestion item hilite on selection.Satish Sampath2009-06-124-17/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Show proper suggestion item hilite on selection.Satish Sampath2009-06-124-17/+3
| |/ / / /
* | | | | am 78f0f8cb: Merge changes 3953,3954 into donutAndroid (Google) Code Review2009-06-1212-118/+331
|\ \ \ \ \ | |/ / / /
| * | | | Merge changes 3953,3954 into donutAndroid (Google) Code Review2009-06-1112-118/+331
| |\ \ \ \
| | * | | | Make the file backup helper not crash if a file you requestedJoe Onorato2009-06-113-45/+110
| | * | | | Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.Joe Onorato2009-06-1112-88/+236
* | | | | | am e8966e12: Merge change 4008 into donutAndroid (Google) Code Review2009-06-123-137/+174
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change 4008 into donutAndroid (Google) Code Review2009-06-113-137/+174
| |\ \ \ \ \
| | * | | | | Fixes #1886237. Views drawing cache was not generated properly.Romain Guy2009-06-113-137/+174
| | |/ / / /
* | | | | | am f229aff1: Merge change 3967 into donutAndroid (Google) Code Review2009-06-123-374/+4275
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change 3967 into donutAndroid (Google) Code Review2009-06-113-374/+4275
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Update control files (pass/fail/nontext/crash) to results from CRB45Guang Zhu2009-06-113-374/+4275
* | | | | | am cb9534f9: Merge change 3907 into donutAndroid (Google) Code Review2009-06-127-40/+298
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change 3907 into donutAndroid (Google) Code Review2009-06-117-40/+298
| |\ \ \ \ \
| | * | | | | Support SMS cell broadcasting for GSM in RIL.javajohnwang2009-06-117-40/+298
* | | | | | | am 657c80b1: (-s ours) Merge change 3775 into donutAndroid (Google) Code Review2009-06-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge change 3775 into donutAndroid (Google) Code Review2009-06-113-0/+47
| |\ \ \ \ \ \
| | * | | | | | DO NOT MERGE.Grace Kloba2009-06-103-0/+47
* | | | | | | | am 116e8ef1: Merge change 3949 into donutAndroid (Google) Code Review2009-06-121-90/+106
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge change 3949 into donutAndroid (Google) Code Review2009-06-111-90/+106
| |\ \ \ \ \ \ \
| | * | | | | | | TextToSpeech class cleanupsJean-Michel Trivi2009-06-111-90/+106
* | | | | | | | | am 3cf0dd6a: Merge change 3940 into donutAndroid (Google) Code Review2009-06-121-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge change 3940 into donutAndroid (Google) Code Review2009-06-111-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash.Mike Lockwood2009-06-111-0/+4
* | | | | | | | | am 35733757: Merge change 3935 into donutAndroid (Google) Code Review2009-06-1267-2/+286
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge change 3935 into donutAndroid (Google) Code Review2009-06-1167-2/+286
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Hook the 12- or 24-hour time format checkbox back up.Eric Fischer2009-06-1167-2/+286
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge change 3958Android (Google) Code Review2009-06-111-14/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix tearDown event loop - message unref, triggers when bluetoothd crashes.Jaikumar Ganesh2009-06-111-14/+16
* | | | | | | | | add a data_version column to the data tableFred Quintana2009-06-112-0/+14
* | | | | | | | | Merge change 3952Android (Google) Code Review2009-06-115-108/+288
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Split FountainView into View and RS parts. Beging adding ProgramVertex to th...Jason Sams2009-06-115-108/+288