Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Bin... | tedbo | 2011-06-09 | 13 | -6/+385 |
* | Merge "Fix USE_TEXT_LAYOUT_CACHE define" | Fabrice Di Meglio | 2011-06-06 | 3 | -19/+43 |
|\ | |||||
| * | Fix USE_TEXT_LAYOUT_CACHE define | Fabrice Di Meglio | 2011-06-06 | 3 | -19/+43 |
* | | Merge "Connecting to a NFC technology may fail." | Martijn Coenen | 2011-06-06 | 2 | -1/+8 |
|\ \ | |||||
| * | | Connecting to a NFC technology may fail. | Martijn Coenen | 2011-06-06 | 2 | -1/+8 |
* | | | Merge "Copy pointer assets for hdpi." | Jeff Brown | 2011-06-06 | 8 | -0/+20 |
|\ \ \ | |||||
| * | | | Copy pointer assets for hdpi. | Jeff Brown | 2011-06-06 | 8 | -0/+20 |
* | | | | am 92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/... | Nick Pelly | 2011-06-06 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/framew... | Nick Pelly | 2011-06-06 | 44 | -10/+420 |
| |\ \ \ \ | |||||
* | \ \ \ \ | am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for te... | TK MUN | 2011-06-06 | 2 | -2/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am cecb710a: am 94260caf: Allow control over search order for tethering upstr... | TK MUN | 2011-06-06 | 2 | -2/+3 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | am 94260caf: Allow control over search order for tethering upstream interface... | TK MUN | 2011-05-25 | 2 | -2/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Allow control over search order for tethering upstream interface selection | TK MUN | 2011-05-25 | 2 | -2/+3 |
* | | | | | | | | am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised transl... | Eric Fischer | 2011-06-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" ... | Eric Fischer | 2011-06-06 | 44 | -10/+420 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycom... | Eric Fischer | 2011-06-06 | 44 | -10/+420 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 | Eric Fischer | 2011-06-06 | 44 | -10/+420 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-06-03 | 44 | -10/+420 |
* | | | | | | | | | | am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption ... | Jaikumar Ganesh | 2011-06-06 | 1 | -3/+63 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" | Jaikumar Ganesh | 2011-06-06 | 1 | -3/+63 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | am 94062517: Merge "Require bonding and encryption for PBAP server" | Jaikumar Ganesh | 2011-05-25 | 1 | -3/+63 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge "Require bonding and encryption for PBAP server" | Jaikumar Ganesh | 2011-05-25 | 1 | -3/+63 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Require bonding and encryption for PBAP server | Mathias Jeppsson | 2011-05-17 | 1 | -3/+63 |
* | | | | | | | | | | | | am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of S... | Jean-Baptiste Queru | 2011-06-06 | 3 | -28/+512 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in... | Jean-Baptiste Queru | 2011-06-06 | 3 | -28/+512 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." | Jean-Baptiste Queru | 2011-05-25 | 3 | -28/+512 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Merge "Adding support for parsing of SMS-CB pdus in UMTS format." | Jean-Baptiste Queru | 2011-05-25 | 3 | -28/+512 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Adding support for parsing of SMS-CB pdus in UMTS format. | Henrik Hall | 2011-01-11 | 3 | -28/+512 |
* | | | | | | | | | | | | Merge "resolved conflicts for merge of b2fd84ad to master" | Marco Nelissen | 2011-06-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of b2fd84ad to master | Marco Nelissen | 2011-06-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp | Marco Nelissen | 2011-06-06 | 8 | -114/+115 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into ginge... | Simon Wilson | 2011-05-24 | 8 | -103/+115 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread | Simon Wilson | 2011-05-24 | 8 | -103/+115 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | Fix a race that could cause GL commands to be executed from the wrong thread. | Mathias Agopian | 2011-05-23 | 6 | -97/+70 |
| | | | | * | | | | | | | | | RefBase subclasses can now decide how they want to be destroyed. | Mathias Agopian | 2011-05-23 | 2 | -4/+17 |
| | | | | * | | | | | | | | | Fix a race in SurfaceFlinger that could cause layers to be leaked forever. | Mathias Agopian | 2011-05-23 | 2 | -1/+17 |
| | | | | * | | | | | | | | | Fix a race-condtion in SurfaceFlinger that could lead to a crash. | Mathias Agopian | 2011-05-23 | 2 | -11/+21 |
* | | | | | | | | | | | | | | Merge "Cleanup of Calendar.java to prep for api" | RoboErik | 2011-06-06 | 1 | -264/+568 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Cleanup of Calendar.java to prep for api | RoboErik | 2011-06-06 | 1 | -264/+568 |
* | | | | | | | | | | | | | | Merge "Unhiding render target code for renderscript" | Alex Sakhartchouk | 2011-06-06 | 2 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Unhiding render target code for renderscript | Alex Sakhartchouk | 2011-06-06 | 2 | -1/+1 |
* | | | | | | | | | | | | | | Merge "Delay set picture if necessary" | John Reck | 2011-06-06 | 1 | -1/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Delay set picture if necessary | John Reck | 2011-06-04 | 1 | -1/+17 |
* | | | | | | | | | | | | | | | Merge "Remove dead code related to gettid" | Glenn Kasten | 2011-06-06 | 9 | -106/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Remove dead code related to gettid | Glenn Kasten | 2011-06-03 | 9 | -106/+10 |
* | | | | | | | | | | | | | | | | Merge "Add WebP Mime-Type support in Android Media File" | Marco Nelissen | 2011-06-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add WebP Mime-Type support in Android Media File | Vikas Arora | 2011-06-03 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | Merge "Fix the false-alarm bug when we skip to the end, which should be OK." | Shih-wei Liao | 2011-06-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Fix the false-alarm bug when we skip to the end, which should be OK. | Shih-wei Liao | 2011-06-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge "resolved conflict for merge of fc51aaec to master" | Wink Saville | 2011-06-04 | 1 | -4/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |