Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix build. | Mathias Agopian | 2011-11-29 | 8 | -153/+28 |
* | am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO N... | Eric Fischer | 2011-11-29 | 0 | -0/+0 |
|\ | |||||
| * | am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 | Eric Fischer | 2011-11-29 | 14 | -52/+52 |
| |\ | |||||
| | * | Merge "Import revised translations. DO NOT MERGE" into ics-mr1 | Eric Fischer | 2011-11-29 | 14 | -52/+52 |
| | |\ | |||||
| | | * | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-11-29 | 14 | -52/+52 |
* | | | | Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8 | Mathias Agopian | 2011-11-29 | 20 | -266/+288 |
|\ \ \ \ | |||||
| * | | | | Add support for sending VSYNC events to the framework | Mathias Agopian | 2011-11-29 | 8 | -28/+153 |
| * | | | | BitTube::read now handles EAGAIN | Mathias Agopian | 2011-11-29 | 2 | -1/+6 |
| * | | | | split ComposerService out of SurfaceComposerClient.h | Mathias Agopian | 2011-11-28 | 8 | -21/+65 |
| * | | | | rewrite SF's message loop on top of Looper | Mathias Agopian | 2011-11-28 | 3 | -216/+64 |
* | | | | | am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" i... | Mathias Agopian | 2011-11-29 | 1 | -0/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1 | Mathias Agopian | 2011-11-29 | 1 | -0/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1 | Mathias Agopian | 2011-11-29 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | temporarily hardcode Nexus S refresh rate | Mathias Agopian | 2011-11-23 | 1 | -0/+1 |
* | | | | | | Merge "Import revised translations." | Eric Fischer | 2011-11-29 | 95 | -1223/+1198 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Import revised translations. | Eric Fischer | 2011-11-29 | 95 | -1223/+1198 |
* | | | | | | | am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t... | Dianne Hackborn | 2011-11-29 | 1 | -9/+23 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the scr... | Dianne Hackborn | 2011-11-29 | 1 | -9/+23 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call... | Dianne Hackborn | 2011-11-29 | 1 | -9/+23 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix issue #5642121: Proximity sensor didn't turn the screen on in call | Dianne Hackborn | 2011-11-28 | 1 | -9/+23 |
* | | | | | | | | am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." int... | Jaikumar Ganesh | 2011-11-29 | 9 | -13/+73 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1 | Jaikumar Ganesh | 2011-11-29 | 9 | -13/+73 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Cleanup references when turning BT off." into ics-mr1 | Jaikumar Ganesh | 2011-11-29 | 9 | -13/+73 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Cleanup references when turning BT off. | Jaikumar Ganesh | 2011-11-28 | 9 | -13/+73 |
* | | | | | | | | | am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." in... | Jaikumar Ganesh | 2011-11-29 | 1 | -10/+34 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1 | Jaikumar Ganesh | 2011-11-29 | 1 | -10/+34 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Cleanup static references when quitting." into ics-mr1 | Jaikumar Ganesh | 2011-11-29 | 1 | -10/+34 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Cleanup static references when quitting. | Jaikumar Ganesh | 2011-11-28 | 1 | -10/+34 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
* | | | | | | | | Merge "Restoring mLayout has private in TextView" | Gilles Debunne | 2011-11-29 | 1 | -7/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Restoring mLayout has private in TextView | Gilles Debunne | 2011-11-28 | 1 | -7/+1 |
* | | | | | | | | | am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1 | Gilles Debunne | 2011-11-29 | 3 | -25/+82 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am 10232fe6: Merge "Extracted text problems" into ics-mr1 | Gilles Debunne | 2011-11-29 | 3 | -25/+82 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge "Extracted text problems" into ics-mr1 | Gilles Debunne | 2011-11-29 | 3 | -25/+82 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Extracted text problems | Gilles Debunne | 2011-11-10 | 3 | -27/+82 |
* | | | | | | | | | | am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1 | Gilles Debunne | 2011-11-29 | 1 | -11/+9 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 7be31bd9: Merge "IOOB in text selection." into ics-mr1 | Gilles Debunne | 2011-11-29 | 1 | -11/+9 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "IOOB in text selection." into ics-mr1 | Gilles Debunne | 2011-11-29 | 1 | -11/+9 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | IOOB in text selection. | Gilles Debunne | 2011-11-20 | 1 | -11/+9 |
* | | | | | | | | | | | am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automatio... | Daniel Sandler | 2011-11-29 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into... | Daniel Sandler | 2011-11-29 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1 | Daniel Sandler | 2011-11-29 | 1 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Quick fix for bug 5646217 blocking automation tests | Daniel Sandler | 2011-11-23 | 1 | -0/+9 |
* | | | | | | | | | | | | am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in... | Yu Shan Emily Lau | 2011-11-28 | 3 | -65/+104 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media re... | Yu Shan Emily Lau | 2011-11-28 | 3 | -65/+104 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge "Add the min fps option to set the min fps in the media recorder test. ... | Yu Shan Emily Lau | 2011-11-28 | 3 | -65/+104 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Add the min fps option to set | Yu Shan Emily Lau | 2011-11-28 | 3 | -65/+104 |
* | | | | | | | | | | | | | am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf"... | Christopher Tate | 2011-11-28 | 4 | -6/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 | Christopher Tate | 2011-11-28 | 4 | -6/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 | Christopher Tate | 2011-11-28 | 4 | -6/+61 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Add iteration-limited mode to FrameworkPerf | Christopher Tate | 2011-11-28 | 4 | -6/+61 |
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | |