Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1 | Eric Fischer | 2011-11-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-11-16 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | No-op merge from ics-mr0 | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Reconcile with ics-factoryrom-2-release | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | | | | ||||||
| \ \ \ \ | ||||||
*-. \ \ \ \ | Reconcile with ics-mr0-release ics-factoryrom-2-release | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | ||||||
| | * | | | tuna: update kernel prebuilt for MR0 - DO NOT MERGE | Colin Cross | 2011-11-11 | 1 | -0/+0 | |
| | * | | | tuna: update kernel prebuilt for MR0 - DO NOT MERGE | Colin Cross | 2011-11-10 | 1 | -0/+0 | |
| | * | | | tuna: update kernel prebuilt for MR0 - DO NOT MERGE | Colin Cross | 2011-11-10 | 1 | -0/+0 | |
| * | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-15 | 0 | -0/+0 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-15 | 0 | -0/+0 | |
| | |\ \ \ | ||||||
| | | * \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-14 | 0 | -0/+0 | |
| | | |\ \ \ | ||||||
| | | | * \ \ | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-11-13 | 0 | -0/+0 | |
| | | | |\ \ \ | ||||||
| | | | | * | | | tuna: new kernel prebuilt -- DO NOT MERGE | Benoit Goby | 2011-11-11 | 1 | -0/+0 | |
* | | | | | | | | resolved conflicts for merge of e125d264 into ics-mr1 | Erik Gilling | 2011-11-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | new kernel prebuilt -- DO NOT MERGE | Erik Gilling | 2011-11-15 | 1 | -0/+0 | |
* | | | | | | | | resolved conflicts for merge of b3d922fb into ics-mr1 | Erik Gilling | 2011-11-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | tuna: new kernel prebuilt -- DO NOT MERGE | Benoit Goby | 2011-11-15 | 1 | -0/+0 | |
| |/ / / / / / | ||||||
* | | | | | | | am e4df16bd: tuna: update touch firmware to 0x62/0x42 | Dima Zavin | 2011-11-15 | 2 | -0/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | tuna: update touch firmware to 0x62/0x42 | Dima Zavin | 2011-11-14 | 2 | -0/+0 | |
* | | | | | | | resolved conflicts for merge of 0c40da8d to ics-mr1 | Erik Gilling | 2011-11-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | new kernel prebuilt -- DO NOT MERGE | Erik Gilling | 2011-11-14 | 1 | -0/+0 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Fix for 5603113 profiles and levels in media_profile.xml are not match... | Rajneesh Chowdury | 2011-11-15 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Fix for 5603113 profiles and levels in media_profile.xml are not matched with... | Rajneesh Chowdury | 2011-11-15 | 1 | -2/+2 | |
* | | | | | | new kernel prebuilt | Erik Gilling | 2011-11-15 | 1 | -0/+0 | |
* | | | | | | Merge commit '8f421487' into manualmerge | Todd Poynor | 2011-11-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | ||||||
| * | | | | tuna: Prebuilt kernel -- DO NOT MERGE | Todd Poynor | 2011-11-14 | 1 | -0/+0 | |
* | | | | | Merge " Fix for issue 5309336 -add videoeditor maximum prefetch YUV f... | Hong Teng | 2011-11-15 | 1 | -1/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix for issue 5309336 | Hong Teng | 2011-11-11 | 1 | -1/+14 | |
* | | | | | | Merge "tuna: Update kernel prebuilt" into ics-mr1 | Paul Eastham | 2011-11-15 | 1 | -0/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | tuna: Update kernel prebuilt | Dima Zavin | 2011-11-15 | 1 | -0/+0 | |
* | | | | | | | am 5a5829e0: tuna: Revert back to touch firmware version 0x70/0x71 (60Hz) | Dima Zavin | 2011-11-15 | 2 | -0/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | ||||||
| * | | | | | tuna: Revert back to touch firmware version 0x70/0x71 (60Hz) | Dima Zavin | 2011-11-14 | 2 | -0/+0 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge "Follow-up fixes to NFC access control changes." into ics-mr1 | Nick Pelly | 2011-11-14 | 2 | -1/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Follow-up fixes to NFC access control changes. | Nick Pelly | 2011-11-14 | 2 | -1/+14 | |
* | | | | | | new kernel prebuilt | Erik Gilling | 2011-11-14 | 1 | -0/+0 | |
* | | | | | | Merge -s ours commit 'ecc911f9be8c6bd1743b80ab95d7287a2e7bc260' into ics-mr1 | The Android Automerger | 2011-11-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | tuna: new kernel prebuilt -- DO NOT MERGE | Benoit Goby | 2011-11-11 | 1 | -0/+0 | |
* | | | | | | Merge (Ignore) 3c9d0e8a from ics-mr0 | Jean-Baptiste Queru | 2011-11-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | tuna: new kernel prebuilt -- DO NOT MERGE | Benoit Goby | 2011-11-11 | 1 | -0/+0 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge (Ignore) c1357fee from ics-mr0 | Jean-Baptiste Queru | 2011-11-11 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | new kernel prebuilt -- DO NOT MERGE | Erik Gilling | 2011-11-11 | 1 | -0/+0 | |
* | | | | | Merge (Ignore) f91ca86e from ics-mr0 | Jean-Baptiste Queru | 2011-11-11 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | new kernel prebuilt -- DO NOT MERGE | Erik Gilling | 2011-11-11 | 1 | -0/+0 | |
* | | | | | Merge commit 'b36310c3' into manualmerge | Todd Poynor | 2011-11-11 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | tuna: prebuilt kernel -- DO NOT MERGE | Todd Poynor | 2011-11-10 | 1 | -0/+0 | |
* | | | | | Merge "Add nfcee_access.xml for tuna." into ics-mr1 | Nick Pelly | 2011-11-11 | 3 | -0/+34 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Add nfcee_access.xml for tuna. | Nick Pelly | 2011-11-11 | 3 | -0/+34 | |
| | |/ / | |/| | | ||||||
* | | | | am 1c623ef0: tuna: update touch ic firmware to 0x61/0x41 | Dima Zavin | 2011-11-11 | 2 | -0/+0 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | tuna: update touch ic firmware to 0x61/0x41 | Dima Zavin | 2011-11-10 | 2 | -0/+0 | |
* | | | | new kernel prebuilt | Erik Gilling | 2011-11-11 | 1 | -0/+0 | |
| |/ / |/| | |