summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-03-0248-48/+96
* am 50c85944: Match INetworkPolicyListener changes.Jeff Sharkey2012-02-071-8/+7
|\
| * Match INetworkPolicyListener changes.Jeff Sharkey2012-02-071-8/+7
* | am dc8940b5: am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\|
| * am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\
| | * am 55231bc5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\
| | | * Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | | |\
* | | | | am 2404bcad: Import translations. DO NOT MERGEEric Fischer2012-01-301-1/+1
|\| | | |
| * | | | Import translations. DO NOT MERGEEric Fischer2012-01-301-1/+1
* | | | | am 515cf53e: Move away from deprecated NetworkInfo extra.Jeff Sharkey2012-01-301-2/+3
|\| | | |
| * | | | Move away from deprecated NetworkInfo extra.Jeff Sharkey2012-01-301-2/+3
* | | | | am b1a4b7d4: Import translations. DO NOT MERGEEric Fischer2012-01-262-26/+26
|\| | | |
| * | | | Import translations. DO NOT MERGEEric Fischer2012-01-262-26/+26
* | | | | am ac71f70c: Update DownloadProvider for new Intent.normalizeMimeType() API.Nick Pelly2012-01-251-23/+3
|\| | | |
| * | | | Update DownloadProvider for new Intent.normalizeMimeType() API.Nick Pelly2012-01-191-23/+3
* | | | | am ca11088a: am 3ddc6cc0: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-070-0/+0
|\| | | |
| * | | | am 3ddc6cc0: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-060-0/+0
| |\| | |
| | * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-060-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-060-0/+0
| | | |\ \ | | | | |/ | | | |/|
* | | | | am 23bb4b4f: am 380044a2: am f720bc68: Allow downloads when no network restri...Jeff Sharkey2012-01-061-2/+3
|\| | | |
| * | | | am 380044a2: am f720bc68: Allow downloads when no network restriction set.Jeff Sharkey2012-01-061-2/+3
| |\| | |
| | * | | am f720bc68: Allow downloads when no network restriction set.Jeff Sharkey2012-01-061-2/+3
| | |\| |
| | | * | Allow downloads when no network restriction set.Jeff Sharkey2012-01-051-2/+3
* | | | | am b1d7241f: Import revised translations.Eric Fischer2011-12-291-1/+1
|\| | | |
| * | | | Import revised translations.Eric Fischer2011-12-291-1/+1
* | | | | am a67beb7a: am 13a08957: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\| | | |
| * | | | am 13a08957: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
| |\| | |
| | * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/
* | | | am f774814b: Merge "Use UID instead of PID."Jeff Sharkey2011-12-081-1/+1
|\| | |
| * | | Merge "Use UID instead of PID."Jeff Sharkey2011-12-081-1/+1
| |\ \ \
| | * | | Use UID instead of PID.Jeff Sharkey2011-11-111-1/+1
* | | | | am 4fded8cf: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-0/+0
|\| | | |
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-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
| | | |\ \
* | | | | | am 388c3a1b: am a318a7fc: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-290-0/+0
|\| | | | |
| * | | | | am a318a7fc: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-290-0/+0
| |\| | | |
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-292-3/+3
| | |/ / /
* | | | | am 3f4471c8: Import revised translations.Eric Fischer2011-11-2948-606/+606
|\| | | |
| * | | | Import revised translations.Eric Fischer2011-11-2948-606/+606
* | | | | am ea2feafc: am fd849573: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-210-0/+0
|\| | | |
| * | | | am fd849573: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-210-0/+0
| |\| | |
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
* | | | | am f1c794aa: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\| | | |
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-180-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
| | | |\ \
* | | | | | am 08dffa74: am c76eb5fa: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-170-0/+0
|\| | | | |
| * | | | | am c76eb5fa: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-170-0/+0
| |\| | | |
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-164-5/+5
| | |/ / /