summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-161-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| | |_|/ / | |/| | |
* | | | | No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEColin Cross2011-11-111-0/+0
| | * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEColin Cross2011-11-101-0/+0
| | * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEColin Cross2011-11-101-0/+0
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-150-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-150-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-140-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-130-0/+0
| | | | |\ \ \
| | | | | * | | tuna: new kernel prebuilt -- DO NOT MERGEBenoit Goby2011-11-111-0/+0
* | | | | | | | resolved conflicts for merge of e125d264 into ics-mr1Erik Gilling2011-11-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | new kernel prebuilt -- DO NOT MERGEErik Gilling2011-11-151-0/+0
* | | | | | | | resolved conflicts for merge of b3d922fb into ics-mr1Erik Gilling2011-11-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | tuna: new kernel prebuilt -- DO NOT MERGEBenoit Goby2011-11-151-0/+0
| |/ / / / / /
* | | | | | | am e4df16bd: tuna: update touch firmware to 0x62/0x42Dima Zavin2011-11-152-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | tuna: update touch firmware to 0x62/0x42Dima Zavin2011-11-142-0/+0
* | | | | | | resolved conflicts for merge of 0c40da8d to ics-mr1Erik Gilling2011-11-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | new kernel prebuilt -- DO NOT MERGEErik Gilling2011-11-141-0/+0
| |/ / / / /
* | | | | | Merge "Fix for 5603113 profiles and levels in media_profile.xml are not match...Rajneesh Chowdury2011-11-151-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix for 5603113 profiles and levels in media_profile.xml are not matched with...Rajneesh Chowdury2011-11-151-2/+2
* | | | | | new kernel prebuiltErik Gilling2011-11-151-0/+0
* | | | | | Merge commit '8f421487' into manualmergeTodd Poynor2011-11-150-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | tuna: Prebuilt kernel -- DO NOT MERGETodd Poynor2011-11-141-0/+0
* | | | | Merge " Fix for issue 5309336 -add videoeditor maximum prefetch YUV f...Hong Teng2011-11-151-1/+14
|\ \ \ \ \
| * | | | | Fix for issue 5309336Hong Teng2011-11-111-1/+14
* | | | | | Merge "tuna: Update kernel prebuilt" into ics-mr1Paul Eastham2011-11-151-0/+0
|\ \ \ \ \ \
| * | | | | | tuna: Update kernel prebuiltDima Zavin2011-11-151-0/+0
* | | | | | | am 5a5829e0: tuna: Revert back to touch firmware version 0x70/0x71 (60Hz)Dima Zavin2011-11-152-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | tuna: Revert back to touch firmware version 0x70/0x71 (60Hz)Dima Zavin2011-11-142-0/+0
| | |/ / / | |/| | |
* | | | | Merge "Follow-up fixes to NFC access control changes." into ics-mr1Nick Pelly2011-11-142-1/+14
|\ \ \ \ \
| * | | | | Follow-up fixes to NFC access control changes.Nick Pelly2011-11-142-1/+14
* | | | | | new kernel prebuiltErik Gilling2011-11-141-0/+0
* | | | | | Merge -s ours commit 'ecc911f9be8c6bd1743b80ab95d7287a2e7bc260' into ics-mr1The Android Automerger2011-11-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | tuna: new kernel prebuilt -- DO NOT MERGEBenoit Goby2011-11-111-0/+0
* | | | | | Merge (Ignore) 3c9d0e8a from ics-mr0Jean-Baptiste Queru2011-11-110-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | tuna: new kernel prebuilt -- DO NOT MERGEBenoit Goby2011-11-111-0/+0
| | |_|/ / | |/| | |
* | | | | Merge (Ignore) c1357fee from ics-mr0Jean-Baptiste Queru2011-11-110-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | new kernel prebuilt -- DO NOT MERGEErik Gilling2011-11-111-0/+0
* | | | | Merge (Ignore) f91ca86e from ics-mr0Jean-Baptiste Queru2011-11-110-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | new kernel prebuilt -- DO NOT MERGEErik Gilling2011-11-111-0/+0
* | | | | Merge commit 'b36310c3' into manualmergeTodd Poynor2011-11-110-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | tuna: prebuilt kernel -- DO NOT MERGETodd Poynor2011-11-101-0/+0
* | | | | Merge "Add nfcee_access.xml for tuna." into ics-mr1Nick Pelly2011-11-113-0/+34
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add nfcee_access.xml for tuna.Nick Pelly2011-11-113-0/+34
| | |/ / | |/| |
* | | | am 1c623ef0: tuna: update touch ic firmware to 0x61/0x41Dima Zavin2011-11-112-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | tuna: update touch ic firmware to 0x61/0x41Dima Zavin2011-11-102-0/+0
* | | | new kernel prebuiltErik Gilling2011-11-111-0/+0
| |/ / |/| |