Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | Merge "Fix races related to volume and mute" | Glenn Kasten | 2012-02-14 | 2 | -31/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Fix races related to volume and mute | Glenn Kasten | 2012-02-08 | 2 | -31/+31 | |
* | | | | | | | | | | | | | | | | | am 4f7adcf7: Merge "Update comments" | Glenn Kasten | 2012-02-14 | 19 | -54/+107 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "Update comments" | Glenn Kasten | 2012-02-14 | 19 | -54/+107 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Update comments | Glenn Kasten | 2012-02-14 | 19 | -54/+107 | |
* | | | | | | | | | | | | | | | | | | am c87b0084: Merge "Refactor animation code in new Draw() method into its own... | Chet Haase | 2012-02-14 | 2 | -69/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Merge "Refactor animation code in new Draw() method into its own method." | Chet Haase | 2012-02-14 | 2 | -69/+75 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Refactor animation code in new Draw() method into its own method. | Chet Haase | 2012-02-14 | 2 | -69/+75 | |
* | | | | | | | | | | | | | | | | | | | am f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop" | Glenn Kasten | 2012-02-14 | 2 | -21/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge "Remove dead code AudioTrack::getLoop" | Glenn Kasten | 2012-02-14 | 2 | -21/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Remove dead code AudioTrack::getLoop | Glenn Kasten | 2012-02-08 | 2 | -21/+0 | |
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | am 150d238f: Use size_t and ssize_t with Vector | Glenn Kasten | 2012-02-14 | 2 | -27/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Use size_t and ssize_t with Vector | Glenn Kasten | 2012-02-14 | 2 | -27/+27 | |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | am d23d2b16: Merge "AudioRecord and AudioTrack client tid" | Glenn Kasten | 2012-02-14 | 9 | -35/+79 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Merge "AudioRecord and AudioTrack client tid" | Glenn Kasten | 2012-02-14 | 9 | -35/+79 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | AudioRecord and AudioTrack client tid | Glenn Kasten | 2012-02-14 | 9 | -35/+79 | |
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | am c26b3a7f: am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-... | Ramanan Rajeswaran | 2012-02-14 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp | Ramanan Rajeswaran | 2012-02-14 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge "DO NOT MERGE" into ics-scoop-plus-aosp | Ramanan Rajeswaran | 2012-02-14 | 6 | -38/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | DO NOT MERGE | Ramanan Rajeswaran | 2012-02-13 | 6 | -38/+11 | |
* | | | | | | | | | | | | | | | | | | am 4212d3fc: Merge "Refactor ViewGroup.drawChild() into View.draw()" | Chet Haase | 2012-02-14 | 2 | -340/+350 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Merge "Refactor ViewGroup.drawChild() into View.draw()" | Chet Haase | 2012-02-14 | 2 | -340/+350 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Refactor ViewGroup.drawChild() into View.draw() | Chet Haase | 2012-02-13 | 2 | -340/+350 | |
* | | | | | | | | | | | | | | | | | | | am a9daa164: Merge "Fix possible races in vsync infrastructure." | Jeff Brown | 2012-02-13 | 3 | -32/+89 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge "Fix possible races in vsync infrastructure." | Jeff Brown | 2012-02-13 | 3 | -32/+89 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Fix possible races in vsync infrastructure. | Jeff Brown | 2012-02-13 | 3 | -32/+89 | |
* | | | | | | | | | | | | | | | | | | | | am b35b9a86: am 6466f400: am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix i... | Jean-Baptiste Queru | 2012-02-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 6466f400: am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prot... | Jean-Baptiste Queru | 2012-02-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI... | Jean-Baptiste Queru | 2012-02-13 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | / / / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call" | Jean-Baptiste Queru | 2012-02-13 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 472512f6: Merge "Fix incorrect prototype for JNI call" | Jean-Baptiste Queru | 2012-02-13 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Fix incorrect prototype for JNI call" | Jean-Baptiste Queru | 2012-02-13 | 1 | -1/+1 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | | | | | | | | Fix incorrect prototype for JNI call | Bhanu Chetlapalli | 2012-01-31 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | am 6ae14555: Merge "fix build" | Guang Zhu | 2012-02-13 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge "fix build" | Guang Zhu | 2012-02-13 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | fix build | Guang Zhu | 2012-02-13 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | am 4535e0c7: Merge "use hard coded WebViewProperties.gfxUseMinimalMemory" | Guang Zhu | 2012-02-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge "use hard coded WebViewProperties.gfxUseMinimalMemory" | Guang Zhu | 2012-02-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | use hard coded WebViewProperties.gfxUseMinimalMemory | Guang Zhu | 2012-02-13 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | am 96d2abab: Merge "Revert "Revert "Test initialization of constant array exp... | Stephen Hines | 2012-02-13 | 3 | -0/+154 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Test initialization of constant array exports.""" | Stephen Hines | 2012-02-13 | 3 | -0/+154 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Revert "Revert "Test initialization of constant array exports."" | Stephen Hines | 2012-02-13 | 3 | -0/+154 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | am ccdc6a6a: Merge "New debugging tool in adb shell dumpsys gfxinfo" | Romain Guy | 2012-02-13 | 2 | -22/+116 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge "New debugging tool in adb shell dumpsys gfxinfo" | Romain Guy | 2012-02-13 | 2 | -22/+116 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | New debugging tool in adb shell dumpsys gfxinfo | Romain Guy | 2012-02-13 | 2 | -22/+116 | |
* | | | | | | | | | | | | | | | | | | | | am 06a240e8: Merge "Increase transfer queue size for DRT" | Guang Zhu | 2012-02-13 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge "Increase transfer queue size for DRT" | Guang Zhu | 2012-02-13 | 1 | -4/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Increase transfer queue size for DRT | Guang Zhu | 2012-02-13 | 1 | -4/+5 | |
| | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | am 94355ed4: Merge "New hooks to allow layouts to improve their performance b... | Philip Milne | 2012-02-13 | 3 | -19/+93 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge "New hooks to allow layouts to improve their performance by doing more ... | Philip Milne | 2012-02-13 | 3 | -19/+93 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | |