summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Make media scanner use new delete-parameter"Marco Nelissen2012-02-072-10/+20
|\
| * Make media scanner use new delete-parameterMarco Nelissen2012-02-072-10/+20
* | Comment out a warning message to avoid log spamming.Chih-Chung Chang2012-02-071-6/+0
* | Merge "make sure to ignore SIGPIPE in the write side of BitTube"Mathias Agopian2012-02-061-1/+4
|\ \
| * | make sure to ignore SIGPIPE in the write side of BitTubeMathias Agopian2012-02-061-1/+4
* | | Merge "Fix a setBackgroundDrawable in layoutlib."Xavier Ducrohet2012-02-061-1/+1
|\ \ \
| * | | Fix a setBackgroundDrawable in layoutlib.Xavier Ducrohet2012-02-061-1/+1
* | | | Merge "Fix bug #5968466 system running out of memory during WebView performan...Fabrice Di Meglio2012-02-061-1/+0
|\ \ \ \
| * | | | Fix bug #5968466 system running out of memory during WebView performance testFabrice Di Meglio2012-02-061-1/+0
* | | | | Merge "Update BiDiTest app for adding GridLayout unit tests"Fabrice Di Meglio2012-02-067-0/+322
|\ \ \ \ \
| * | | | | Update BiDiTest app for adding GridLayout unit testsFabrice Di Meglio2012-02-067-0/+322
| |/ / / /
* | | | | am a0da8adf: am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid c...John Wang2012-02-060-0/+0
|\ \ \ \ \
| * \ \ \ \ am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into i...John Wang2012-02-060-0/+0
| |\ \ \ \ \
| | * \ \ \ \ am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1John Wang2012-02-061-3/+2
| | |\ \ \ \ \
* | | \ \ \ \ \ am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid c...John Wang2012-02-061-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into i...John Wang2012-02-061-3/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1John Wang2012-02-061-3/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Don't use SNR in the invalid check." into ics-mr1John Wang2012-02-061-3/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Don't use SNR in the invalid check.John Wang2012-02-061-3/+2
* | | | | | | | | | Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into mult...Craig Mautner2012-02-063-999/+1127
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple me...Craig Mautner2012-02-063-999/+1127
* | | | | | | | | | | Merge "CrespoMMS appears after delay in the thread"Tom Taylor2012-02-062-53/+142
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CrespoMMS appears after delay in the threadTom Taylor2012-02-062-53/+142
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in layoutli...Xavier Ducrohet2012-02-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the plat...Xavier Ducrohet2012-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it....Xavier Ducrohet2012-02-064-21/+57
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
* | | | | | | | | | | am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars i...Xavier Ducrohet2012-02-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same wa...Xavier Ducrohet2012-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it....Xavier Ducrohet2012-02-064-21/+57
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Setup ActionBars in layoutlib the same way the platform does it. do not merge.Xavier Ducrohet2012-02-064-21/+57
* | | | | | | | | | Merge "Don't call virtual function in destructor of SurfaceMediaSource"James Dong2012-02-062-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't call virtual function in destructor of SurfaceMediaSourceJames Dong2012-02-062-4/+6
* | | | | | | | | | | Merge "Setup ActionBars in layoutlib the same way the platform does it. do no...Xavier Ducrohet2012-02-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Setup ActionBars in layoutlib the same way the platform does it. do not merge.Xavier Ducrohet2012-02-064-21/+57
* | | | | | | | | | | | Merge "Setup ActionBars in layoutlib the same way the platform does it."Xavier Ducrohet2012-02-064-21/+57
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Setup ActionBars in layoutlib the same way the platform does it.Xavier Ducrohet2012-02-064-21/+57
* | | | | | | | | | | | | Merge "Check for null ActivityInfo."Amith Yamasani2012-02-061-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Check for null ActivityInfo.Amith Yamasani2012-02-061-1/+2
* | | | | | | | | | | | | Merge "Use WebKit hit testing result for centering on double-tap zoom."Mangesh Ghiware2012-02-063-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use WebKit hit testing result for centering on double-tap zoom.Mangesh Ghiware2012-02-063-1/+30
* | | | | | | | | | | | | | am f9bb376b: am afaec576: am a9d9fa72: Merge "docs: switch from caps to initi...Scott Main2012-02-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for d...Scott Main2012-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am a9d9fa72: Merge "docs: switch from caps to initial-case for device button ...Scott Main2012-02-0615-99/+170
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | am dbee29ba: am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initi...Scott Main2012-02-0615-99/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for d...Scott Main2012-02-0615-99/+170
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am a9d9fa72: Merge "docs: switch from caps to initial-case for device button ...Scott Main2012-02-0615-99/+170
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "docs: switch from caps to initial-case for device button names" into i...Scott Main2012-02-0615-99/+170
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | docs: switch from caps to initial-case for device button namesScott Main2012-02-0615-99/+170
* | | | | | | | | | | | | | | am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes a...Jean-Baptiste Queru2012-02-062-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of...Jean-Baptiste Queru2012-02-062-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /