| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp | Gloria Wang | 2010-10-10 | 34 | -546/+1691 |
| |\ | |||||
| | * | resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp | Gloria Wang | 2010-10-07 | 34 | -546/+1691 |
| | |\ | |||||
| | | * | Merge "Update of DRM framework." | Gloria Wang | 2010-10-07 | 34 | -545/+1690 |
| | | |\ | |||||
| | | | * | Update of DRM framework. | Takeshi Aimi | 2010-10-04 | 34 | -545/+1690 |
| * | | | | am bb708373: am 949f7d90: Merge "Work to support switching transport streams ... | Andreas Huber | 2010-10-10 | 16 | -112/+463 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | am 949f7d90: Merge "Work to support switching transport streams mid-stream an... | Andreas Huber | 2010-10-07 | 16 | -112/+463 |
| | |\ \ \ | |||||
| | | * \ \ | Merge "Work to support switching transport streams mid-stream and signalling ... | Andreas Huber | 2010-10-07 | 16 | -112/+463 |
| | | |\ \ \ | |||||
| | | | * | | | Work to support switching transport streams mid-stream and signalling discont... | Andreas Huber | 2010-10-07 | 16 | -112/+463 |
| * | | | | | | am 51501aa8: (-s ours) am b74941e3: Merge "Fixed popup assets (background)" i... | Justin Ho | 2010-10-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | am b74941e3: Merge "Fixed popup assets (background)" into gingerbread | Justin Ho | 2010-10-07 | 6 | -0/+0 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Merge "Fixed popup assets (background)" into gingerbread | Justin Ho | 2010-10-07 | 6 | -0/+0 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixed popup assets (background) | Gilles Debunne | 2010-10-07 | 6 | -0/+0 |
| * | | | | | | | am b3616395: am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treat... | Adam Powell | 2010-10-10 | 2 | -1/+23 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as applica... | Adam Powell | 2010-10-07 | 2 | -1/+23 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge "Fix bug 3071869 - text anchors are now treated as application sub-pane... | Adam Powell | 2010-10-07 | 2 | -1/+23 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Fix bug 3071869 - text anchors are now treated as application sub-panels. | Adam Powell | 2010-10-07 | 2 | -1/+23 |
| * | | | | | | | | am 6a15f0d7: am 6275dbbe: Merge "Quiet unnecessary debug logging." into ginge... | Brad Fitzpatrick | 2010-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread | Brad Fitzpatrick | 2010-10-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Merge "Quiet unnecessary debug logging." into gingerbread | Brad Fitzpatrick | 2010-10-07 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | | * | | | | | Quiet unnecessary debug logging. | Brad Fitzpatrick | 2010-10-07 | 1 | -1/+1 |
| * | | | | | | | | am 45bd1159: am 02654f01: Merge "On this particular device the hardware video... | Andreas Huber | 2010-10-10 | 5 | -17/+56 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 02654f01: Merge "On this particular device the hardware video decoder spit... | Andreas Huber | 2010-10-07 | 5 | -17/+56 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Merge "On this particular device the hardware video decoder spits out buffers... | Andreas Huber | 2010-10-07 | 5 | -17/+56 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | On this particular device the hardware video decoder spits out buffers that d... | Andreas Huber | 2010-10-07 | 5 | -17/+56 |
| * | | | | | | | | | am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread | Kenny Root | 2010-10-10 | 1 | -12/+4 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread | Kenny Root | 2010-10-07 | 1 | -12/+4 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | Merge "Eliminate MCS_GIVE_UP state" into gingerbread | Kenny Root | 2010-10-07 | 1 | -12/+4 |
| | | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | | | * | | | | | | Eliminate MCS_GIVE_UP state | Kenny Root | 2010-10-07 | 1 | -12/+4 |
| * | | | | | | | | | am 5e3329b5: am e86a6b2a: Merge "Removed unused and broken screen_progress" i... | Gilles Debunne | 2010-10-10 | 5 | -27/+0 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread | Gilles Debunne | 2010-10-07 | 5 | -27/+0 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | Merge "Removed unused and broken screen_progress" into gingerbread | Gilles Debunne | 2010-10-07 | 5 | -27/+0 |
| | | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | | * | | | | | | Removed unused and broken screen_progress | Gilles Debunne | 2010-10-06 | 5 | -27/+0 |
| * | | | | | | | | | am b8d40d26: am 30f5c8fe: More DropBoxManager javadoc love. | Brad Fitzpatrick | 2010-10-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | am 30f5c8fe: More DropBoxManager javadoc love. | Brad Fitzpatrick | 2010-10-07 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | More DropBoxManager javadoc love. | Brad Fitzpatrick | 2010-10-07 | 1 | -2/+2 |
| | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | | am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into ginge... | Brad Fitzpatrick | 2010-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread | Brad Fitzpatrick | 2010-10-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Merge "DropBox.Entry javadoc syntax fix" into gingerbread | Brad Fitzpatrick | 2010-10-07 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | | | * | | | | | DropBox.Entry javadoc syntax fix | Brad Fitzpatrick | 2010-10-07 | 1 | -1/+1 |
| * | | | | | | | | am c296f22e: am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" | Kenny Root | 2010-10-10 | 1 | -32/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" | Kenny Root | 2010-10-07 | 1 | -32/+0 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Revert "Only allow 8 OBBs to be mounted by a UID" | Kenny Root | 2010-10-07 | 1 | -32/+0 |
| | | |/ / / / / | |||||
| * | | | | | | | resolved conflicts for merge of 5df4b5a7 to master | Jean-Baptiste Queru | 2010-10-10 | 2 | -2/+12 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 08fb5851: Merge "Add flag to skip restoring network seletion." into ginger... | John Wang | 2010-10-07 | 2 | -2/+12 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge "Add flag to skip restoring network seletion." into gingerbread | John Wang | 2010-10-07 | 2 | -2/+12 |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | | * | | | | Add flag to skip restoring network seletion. | John Wang | 2010-10-07 | 2 | -2/+12 |
| * | | | | | | | Merge "0-memcpy video recording framework" | James Dong | 2010-10-10 | 2 | -2/+23 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 0-memcpy video recording framework | James Dong | 2010-10-09 | 2 | -2/+23 |
| * | | | | | | | | am 82aacdde: (-s ours) am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth ... | Eric Rowe | 2010-10-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | | am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress t... | Eric Rowe | 2010-10-07 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |