summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add read permission for external storagejellybean-stablejellybeanSelim Gurun2012-06-071-1/+1
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am 4230220e: Import revised translations.Eric Fischer2011-11-012-0/+40
| |\
| * \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \
| | * \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \
| | | * | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |/| | | |/|/ /
| | * | am 71922b96: Merge "Import revised translations."Eric Fischer2011-10-181-0/+20
| | |\ \ | | |/ / | |/| |
| | * | am 8237beb2: (-s ours) am 94d7e982: (-s ours) Import revised translations. D...Eric Fischer2011-10-180-0/+0
| | |\ \
| | * \ \ am ce323a55: Import revised translations.Eric Fischer2011-09-201-0/+20
| | |\ \ \
| | * \ \ \ am 2c99a766: (-s ours) am ca273e1f: (-s ours) Import revised translations. D...Eric Fischer2011-09-160-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "Import revised translations."Eric Fischer2011-11-020-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Import revised translations.Eric Fischer2011-11-022-0/+40
| |/ / / / /
* / / / / / Import revised translations.ics-releaseicscm-9.1.0Eric Fischer2011-11-012-0/+40
|/ / / / /
* | | | | Merge "Import revised translations."Eric Fischer2011-10-181-0/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Import revised translations.Eric Fischer2011-10-181-0/+20
| | |_|/ | |/| |
* | | | am 94d7e982: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+20
|/ / /
* | / Import revised translations.Eric Fischer2011-09-201-0/+20
| |/ |/|
* | am ca273e1f: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-160-0/+0
|\ \ | |/ |/|
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-161-0/+20
|/
* Import revised translations.Eric Fischer2011-05-264-0/+80
* Reconcile with gingerbread-releaseThe Android Open Source Project2011-05-200-0/+0
|\
| * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-04-010-0/+0
| |\
| | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-300-0/+0
| |/|
| | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-280-0/+0
| | |\
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-280-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-250-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-250-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-250-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-240-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-230-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-220-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-220-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-210-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-180-0/+0
| | |/|
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-180-0/+0
| | | |\
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-170-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-160-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-140-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-120-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-110-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-090-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-070-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-040-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-040-0/+0
| | | |/|
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-03-030-0/+0
| | | |/|
| | | | * Import revised translations. DO NOT MERGEEric Fischer2011-02-181-1/+1
* | | | | am 2f860f15: (-s ours) am 63fff9c7: resolved conflicts for merge of 3a6928aa ...Eric Fischer2011-04-050-0/+0
|\ \ \ \ \
| * \ \ \ \ am 63fff9c7: resolved conflicts for merge of 3a6928aa to gingerbread-plus-aospEric Fischer2011-04-040-0/+0
| |\ \ \ \ \
| | * | | | | resolved conflicts for merge of 3a6928aa to gingerbread-plus-aospEric Fischer2011-04-040-0/+0
| | |\| | | |