summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-220-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | ICL53The Android Automerger2011-11-221-13/+3
| * | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-220-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | IML52CThe Android Automerger2011-11-221-1/+1
| * | | | | | | | IML53The Android Automerger2011-11-221-13/+3
| * | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | IML52BThe Android Automerger2011-11-211-1/+1
| | * | | | | | | | IML52The Android Automerger2011-11-211-1/+1
* | | | | | | | | | am 43583c1a: am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-rel...The Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | | | | | | | |
| | | \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-220-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | / / / | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | ITL41FThe Android Automerger2011-11-211-1/+1
| | | | * | | | | | ITL41EThe Android Automerger2011-11-211-1/+1
| | | * | | | | | | ICL52The Android Automerger2011-11-211-13/+3
| | | * | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-210-0/+0
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | ICL49BThe Android Automerger2011-11-181-13/+3
| | | | * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-180-0/+0
| | | | |\ \ \ \ \ \
* | | | | \ \ \ \ \ \ am 6b95f9b0: Ignore version numbers from AOSPJean-Baptiste Queru2011-11-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Ignore version numbers from AOSPJean-Baptiste Queru2011-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Restore AOSP-specific pseudo-version-numbers.Jean-Baptiste Queru2011-11-222-3/+3
* | | | | | | | | | | am 5764dca0: (-s ours) am bb0e59be: resolved conflicts for merge of aca203ff ...Bart Sears2011-11-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1Bart Sears2011-11-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | resolved conflicts for merge of aca203ff to ics-mr1Bart Sears2011-11-200-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | ICS MR0.1 will be version 4.0.2 - do not mergeBart Sears2011-11-192-1/+2
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | am 14c2d2c1: am 1ca1730b: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 1ca1730b: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-180-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-180-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | | | | | |
| \ \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ \ Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | IML48CThe Android Automerger2011-11-181-1/+1
| | * | | | | | | IML48BThe Android Automerger2011-11-171-1/+1
| | * | | | | | | IML48The Android Automerger2011-11-171-13/+3
| | * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | IML47BThe Android Automerger2011-11-161-1/+1
| | | * | | | | | | IML47The Android Automerger2011-11-161-13/+3
| | | * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | IML46BThe Android Automerger2011-11-151-1/+1
| | | | * | | | | | | IML46The Android Automerger2011-11-151-13/+3
| | | | * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | | | |\ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | | * | | | | | | IML45BThe Android Automerger2011-11-141-1/+1
| | | | * | | | | | | IML45The Android Automerger2011-11-141-13/+3
| | | | * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-140-0/+0
| | | | |\ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | | * | | | | | | IML44The Android Automerger2011-11-131-13/+3
| | | | * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | | |\ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | | * | | | | | | IML41DThe Android Automerger2011-11-111-1/+1
| | | | * | | | | | | IML41CThe Android Automerger2011-11-101-1/+1
| | | | * | | | | | | IML41BThe Android Automerger2011-11-101-1/+1
| * | | | | | | | | | ICL49The Android Automerger2011-11-181-13/+3
| * | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
generated by cgit v1.1 at 2025-04-03 17:35:15 +0000