summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix build.Mathias Agopian2011-11-298-153/+28
* am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO N...Eric Fischer2011-11-290-0/+0
|\
| * am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-2914-52/+52
| |\
| | * Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-2914-52/+52
| | |\
| | | * Import revised translations. DO NOT MERGEEric Fischer2011-11-2914-52/+52
* | | | Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8Mathias Agopian2011-11-2920-266/+288
|\ \ \ \
| * | | | Add support for sending VSYNC events to the frameworkMathias Agopian2011-11-298-28/+153
| * | | | BitTube::read now handles EAGAINMathias Agopian2011-11-292-1/+6
| * | | | split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-288-21/+65
| * | | | rewrite SF's message loop on top of LooperMathias Agopian2011-11-283-216/+64
* | | | | am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" i...Mathias Agopian2011-11-291-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1Mathias Agopian2011-11-291-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1Mathias Agopian2011-11-291-0/+1
| | |\ \ \
| | | * | | temporarily hardcode Nexus S refresh rateMathias Agopian2011-11-231-0/+1
* | | | | | Merge "Import revised translations."Eric Fischer2011-11-2995-1223/+1198
|\ \ \ \ \ \
| * | | | | | Import revised translations.Eric Fischer2011-11-2995-1223/+1198
* | | | | | | am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t...Dianne Hackborn2011-11-291-9/+23
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the scr...Dianne Hackborn2011-11-291-9/+23
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call...Dianne Hackborn2011-11-291-9/+23
| | |\ \ \ \ \
| | | * | | | | Fix issue #5642121: Proximity sensor didn't turn the screen on in callDianne Hackborn2011-11-281-9/+23
* | | | | | | | am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." int...Jaikumar Ganesh2011-11-299-13/+73
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1Jaikumar Ganesh2011-11-299-13/+73
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Cleanup references when turning BT off." into ics-mr1Jaikumar Ganesh2011-11-299-13/+73
| | |\ \ \ \ \ \
| | | * | | | | | Cleanup references when turning BT off.Jaikumar Ganesh2011-11-289-13/+73
* | | | | | | | | am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." in...Jaikumar Ganesh2011-11-291-10/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1Jaikumar Ganesh2011-11-291-10/+34
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Cleanup static references when quitting." into ics-mr1Jaikumar Ganesh2011-11-291-10/+34
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Cleanup static references when quitting.Jaikumar Ganesh2011-11-281-10/+34
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | Merge "Restoring mLayout has private in TextView"Gilles Debunne2011-11-291-7/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Restoring mLayout has private in TextViewGilles Debunne2011-11-281-7/+1
* | | | | | | | | am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1Gilles Debunne2011-11-293-25/+82
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 10232fe6: Merge "Extracted text problems" into ics-mr1Gilles Debunne2011-11-293-25/+82
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "Extracted text problems" into ics-mr1Gilles Debunne2011-11-293-25/+82
| | |\ \ \ \ \ \ \
| | | * | | | | | | Extracted text problemsGilles Debunne2011-11-103-27/+82
* | | | | | | | | | am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1Gilles Debunne2011-11-291-11/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 7be31bd9: Merge "IOOB in text selection." into ics-mr1Gilles Debunne2011-11-291-11/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "IOOB in text selection." into ics-mr1Gilles Debunne2011-11-291-11/+9
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | IOOB in text selection.Gilles Debunne2011-11-201-11/+9
* | | | | | | | | | | am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automatio...Daniel Sandler2011-11-291-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into...Daniel Sandler2011-11-291-0/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1Daniel Sandler2011-11-291-0/+9
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Quick fix for bug 5646217 blocking automation testsDaniel Sandler2011-11-231-0/+9
* | | | | | | | | | | | am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in...Yu Shan Emily Lau2011-11-283-65/+104
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media re...Yu Shan Emily Lau2011-11-283-65/+104
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Add the min fps option to set the min fps in the media recorder test. ...Yu Shan Emily Lau2011-11-283-65/+104
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Add the min fps option to setYu Shan Emily Lau2011-11-283-65/+104
* | | | | | | | | | | | | am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf"...Christopher Tate2011-11-284-6/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1Christopher Tate2011-11-284-6/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1Christopher Tate2011-11-284-6/+61
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Add iteration-limited mode to FrameworkPerfChristopher Tate2011-11-284-6/+61
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |