summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 1864d01f: Merge change Iae849da2 into eclairMike Reed2009-10-301-0/+21
|\
| * Merge change Iae849da2 into eclairAndroid (Google) Code Review2009-10-301-0/+21
| |\
| | * add table maskfilterMike Reed2009-10-301-0/+21
* | | am 3cf254d2: Merge change I4b3db907 into eclairJaikumar Ganesh2009-10-301-19/+4
|\ \ \ | |/ /
| * | Merge change I4b3db907 into eclairAndroid (Google) Code Review2009-10-301-19/+4
| |\ \
| | * | Revert the channge where channels were not selected randomly.Jaikumar Ganesh2009-10-301-19/+4
* | | | am 824838d7: Avoid NPE when callers send null selection args.Jeff Sharkey2009-10-291-2/+6
|\ \ \ \ | |/ / /
| * | | Avoid NPE when callers send null selection args.Jeff Sharkey2009-10-291-2/+6
* | | | am fae288c7: Merge change I9efe265f into eclairFred Quintana2009-10-291-3/+7
|\ \ \ \ | |/ / /
| * | | Merge change I9efe265f into eclairAndroid (Google) Code Review2009-10-291-3/+7
| |\ \ \
| | * | | unhide AccountManagerResponseFred Quintana2009-10-281-3/+7
* | | | | am 154d61fc: Merge change Id6f158b3 into eclairEd Heyl2009-10-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge change Id6f158b3 into eclairAndroid (Google) Code Review2009-10-291-1/+1
| |\ \ \ \
| | * | | | Removed javadoc link to hidden class (temporary fix for build)Ed Heyl2009-10-291-1/+1
* | | | | | am 957e5867: process: Disable debuggingSan Mehat2009-10-291-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | process: Disable debuggingSan Mehat2009-10-291-1/+1
* | | | | | am 4388b988: Merge change Idc4c7714 into eclairCostin Manolache2009-10-292-76/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change Idc4c7714 into eclairAndroid (Google) Code Review2009-10-292-76/+26
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Revert the changes that introduced new exception that wouldn't have occured b...Costin Manolache2009-10-292-76/+26
| | |/ / /
* | | | | am b5c05516: Merge change I3b7d5cbe into eclairJeff Hamilton2009-10-291-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge change I3b7d5cbe into eclairAndroid (Google) Code Review2009-10-291-1/+2
| |\ \ \ \
| | * | | | Copy the selection args when creating a CPO since callers often reuse the pas...Jeff Hamilton2009-10-281-1/+2
* | | | | | am 8e312e81: Merge change Ia5109a87 into eclairSan Mehat2009-10-291-0/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change Ia5109a87 into eclairAndroid (Google) Code Review2009-10-291-0/+22
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | process: Add debug code to log process group transitionsSan Mehat2009-10-291-0/+22
* | | | | | am b575e4df: Merge change I4a943184 into eclairJack Palevich2009-10-291-4/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change I4a943184 into eclairAndroid (Google) Code Review2009-10-291-4/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Avoid trying to throw multiple exceptions at once.Jack Palevich2009-10-281-4/+6
| | | |/ / | | |/| |
* | | | | am 22dad592: Merge change I6cae32c7 into eclairSuchi Amalapurapu2009-10-291-14/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge change I6cae32c7 into eclairAndroid (Google) Code Review2009-10-291-14/+12
| |\ \ \ \
| | * | | | When upgrading packages with shared user ids make sure we are eliminatingSuchi Amalapurapu2009-10-291-14/+12
| | |/ / /
| * | | | Import revised translations. DO NOT MERGEEric Fischer2009-10-282-65/+65
| |/ / /
* | | | resolved conflicts for merge 31957f1b to eclair-mr2Marco Nelissen2009-10-294-107/+176
|\ \ \ \ | |/ / /
| * | | - add javadoc for the account managerFred Quintana2009-10-284-107/+176
* | | | Merge change I35155c1d into eclair-mr2Android (Google) Code Review2009-10-291-1/+8
|\ \ \ \
| * | | | divide mRestoredScale before useCary Clark2009-10-291-1/+8
* | | | | am 5e5eb393: Merge change Id572ffc7 into eclairFred Quintana2009-10-291-5/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge change Id572ffc7 into eclairAndroid (Google) Code Review2009-10-281-5/+6
| |\ \ \ | | |/ / | |/| |
| | * | don't throw an exception when we can't find a pending sync operation in the d...Fred Quintana2009-10-281-5/+6
* | | | DO NOT MERGE. Send a message when the picture changes and find is up to searc...Leon Scroggins2009-10-292-1/+20
* | | | Merge change Ie8672184 into eclair-mr2Android (Google) Code Review2009-10-291-2/+9
|\ \ \ \
| * | | | Add error code column to SMSTom Taylor2009-10-281-2/+9
* | | | | am d85c4b34: Merge change Idb328ab7 into eclairYing Wang2009-10-291-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge change Idb328ab7 into eclairAndroid (Google) Code Review2009-10-271-0/+4
| |\ \ \ \
| | * | | | Explicitly specify that online-sdk depends on framework-res.Ying Wang2009-10-271-0/+4
| * | | | | Merge change I882d2eb8 into eclairAndroid (Google) Code Review2009-10-271-3/+1
| |\ \ \ \ \
| | * | | | | do not mergeMike Reed2009-10-271-3/+1
* | | | | | | am 1f668fff: Merge change Idb13ed9a into eclairDianne Hackborn2009-10-291-2/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge change Idb13ed9a into eclairAndroid (Google) Code Review2009-10-271-2/+11
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Add SDK version for MR1.Dianne Hackborn2009-10-261-2/+11
| | | |/ / / | | |/| | |