summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-release history after reset to masterThe Android Automerger2012-03-070-0/+0
|\
| * merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| |\
| | * merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | |\
| | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-080-0/+0
| | | |\
| | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-250-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-090-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-020-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-12-120-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-300-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-130-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-030-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-300-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-260-0/+0
| | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-0610-19/+10
|/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Import translations. DO NOT MERGEEric Fischer2012-03-0548-86/+49
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | / / / / / | | |_|_|/ / / / / | |/| | | | | | |