summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/p...ics-releaseicscm-9.1.0Steve Kondik2012-03-281-2/+3
|\
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-060-0/+0
| |\
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| | |\
| | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | | |\
| | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| | | | |\
| | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | | | | |\
| | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| | | | | | |\
| | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-300-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-270-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-10-260-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-130-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-120-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-110-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-260-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-310-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | |/|
| * | | | | | | | | | | | | | | | | | | | | | Allow downloads when no network restriction set.Jeff Sharkey2012-01-051-2/+3
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Crespo4G: Fix file downloads via browser over WiMax - 2 of 2Robert Burns2011-12-221-0/+3
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-292-3/+3
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-164-5/+5
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am 8ed79f16: Import revised translations. DO NOT MERGEEric Fischer2011-11-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-141-1/+1
* | | | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-016-14/+214
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am aed71cf0: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-272-3/+3
* | | | | | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-276-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-266-14/+14
* | | | | | | | | | | | | | | | | am 89b10fff: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-262-4/+4
* | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2647-600/+600
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-251-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | / / / / / / / / / / / / / | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Sanity check only after updating from file size." into ics-mr0Jeff Sharkey2011-10-251-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Sanity check only after updating from file size.Jeff Sharkey2011-10-241-7/+7
* | | | | | | | | | | | | | | am 3074179d: Merge "add more logging when download manager deletes files" int...Doug Zongker2011-10-181-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "add more logging when download manager deletes files" into ics-mr0Doug Zongker2011-10-181-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | add more logging when download manager deletes filesDoug Zongker2011-10-181-6/+6
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-10-183-1/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Import revised translations.Eric Fischer2011-10-183-1/+101
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | fix build break (unescaped apostrophe in string)Doug Zongker2011-10-181-1/+1
* | | | | | | | | | | | | | | am 3d2ccc9f: Merge "log when DownloadManager deletes files" into ics-mr0Doug Zongker2011-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "log when DownloadManager deletes files" into ics-mr0Doug Zongker2011-10-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | log when DownloadManager deletes filesDoug Zongker2011-10-181-0/+1
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |