summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge "Fix races related to volume and mute"Glenn Kasten2012-02-142-31/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix races related to volume and muteGlenn Kasten2012-02-082-31/+31
* | | | | | | | | | | | | | | | | am 4f7adcf7: Merge "Update comments"Glenn Kasten2012-02-1419-54/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Update comments"Glenn Kasten2012-02-1419-54/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Update commentsGlenn Kasten2012-02-1419-54/+107
* | | | | | | | | | | | | | | | | | am c87b0084: Merge "Refactor animation code in new Draw() method into its own...Chet Haase2012-02-142-69/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge "Refactor animation code in new Draw() method into its own method."Chet Haase2012-02-142-69/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Refactor animation code in new Draw() method into its own method.Chet Haase2012-02-142-69/+75
* | | | | | | | | | | | | | | | | | | am f4e1bdc1: Merge "Remove dead code AudioTrack::getLoop"Glenn Kasten2012-02-142-21/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Remove dead code AudioTrack::getLoop"Glenn Kasten2012-02-142-21/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Remove dead code AudioTrack::getLoopGlenn Kasten2012-02-082-21/+0
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 150d238f: Use size_t and ssize_t with VectorGlenn Kasten2012-02-142-27/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Use size_t and ssize_t with VectorGlenn Kasten2012-02-142-27/+27
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am d23d2b16: Merge "AudioRecord and AudioTrack client tid"Glenn Kasten2012-02-149-35/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge "AudioRecord and AudioTrack client tid"Glenn Kasten2012-02-149-35/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | AudioRecord and AudioTrack client tidGlenn Kasten2012-02-149-35/+79
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am c26b3a7f: am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-...Ramanan Rajeswaran2012-02-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aospRamanan Rajeswaran2012-02-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "DO NOT MERGE" into ics-scoop-plus-aospRamanan Rajeswaran2012-02-146-38/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | DO NOT MERGERamanan Rajeswaran2012-02-136-38/+11
* | | | | | | | | | | | | | | | | | am 4212d3fc: Merge "Refactor ViewGroup.drawChild() into View.draw()"Chet Haase2012-02-142-340/+350
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge "Refactor ViewGroup.drawChild() into View.draw()"Chet Haase2012-02-142-340/+350
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Refactor ViewGroup.drawChild() into View.draw()Chet Haase2012-02-132-340/+350
* | | | | | | | | | | | | | | | | | | am a9daa164: Merge "Fix possible races in vsync infrastructure."Jeff Brown2012-02-133-32/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "Fix possible races in vsync infrastructure."Jeff Brown2012-02-133-32/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Fix possible races in vsync infrastructure.Jeff Brown2012-02-133-32/+89
* | | | | | | | | | | | | | | | | | | | am b35b9a86: am 6466f400: am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix i...Jean-Baptiste Queru2012-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 6466f400: am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prot...Jean-Baptiste Queru2012-02-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am fca4ff38: am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI...Jean-Baptiste Queru2012-02-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | / / / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | am eaf2617f: am 472512f6: Merge "Fix incorrect prototype for JNI call"Jean-Baptiste Queru2012-02-131-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 472512f6: Merge "Fix incorrect prototype for JNI call"Jean-Baptiste Queru2012-02-131-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix incorrect prototype for JNI call"Jean-Baptiste Queru2012-02-131-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | Fix incorrect prototype for JNI callBhanu Chetlapalli2012-01-311-1/+1
* | | | | | | | | | | | | | | | | | | | | am 6ae14555: Merge "fix build"Guang Zhu2012-02-131-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge "fix build"Guang Zhu2012-02-131-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | fix buildGuang Zhu2012-02-131-1/+0
* | | | | | | | | | | | | | | | | | | | | | am 4535e0c7: Merge "use hard coded WebViewProperties.gfxUseMinimalMemory"Guang Zhu2012-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge "use hard coded WebViewProperties.gfxUseMinimalMemory"Guang Zhu2012-02-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | use hard coded WebViewProperties.gfxUseMinimalMemoryGuang Zhu2012-02-131-1/+1
| | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | am 96d2abab: Merge "Revert "Revert "Test initialization of constant array exp...Stephen Hines2012-02-133-0/+154
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Test initialization of constant array exports."""Stephen Hines2012-02-133-0/+154
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Revert "Revert "Test initialization of constant array exports.""Stephen Hines2012-02-133-0/+154
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am ccdc6a6a: Merge "New debugging tool in adb shell dumpsys gfxinfo"Romain Guy2012-02-132-22/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "New debugging tool in adb shell dumpsys gfxinfo"Romain Guy2012-02-132-22/+116
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | New debugging tool in adb shell dumpsys gfxinfoRomain Guy2012-02-132-22/+116
* | | | | | | | | | | | | | | | | | | | am 06a240e8: Merge "Increase transfer queue size for DRT"Guang Zhu2012-02-131-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Increase transfer queue size for DRT"Guang Zhu2012-02-131-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Increase transfer queue size for DRTGuang Zhu2012-02-131-4/+5
| | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 94355ed4: Merge "New hooks to allow layouts to improve their performance b...Philip Milne2012-02-133-19/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge "New hooks to allow layouts to improve their performance by doing more ...Philip Milne2012-02-133-19/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |