summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 0b17fc36: am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_a...John Wang2012-02-141-7/+17
|\
| * am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaR...John Wang2012-02-141-7/+17
| |\
| | * am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ic...John Wang2012-02-141-7/+17
| | |\
| | | * Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1John Wang2012-02-141-7/+17
| | | |\
| | | | * Only use CDMA rssi for config_alwaysUseCdmaRssi.John Wang2012-02-131-7/+17
* | | | | Merge "Update the scale while updating the drawGL functor"Teng-Hui Zhu2012-02-141-2/+2
|\ \ \ \ \
| * | | | | Update the scale while updating the drawGL functorTeng-Hui Zhu2012-02-141-2/+2
* | | | | | Merge changes I7a6b9db4,Ib579f580Mathias Agopian2012-02-1410-630/+254
|\ \ \ \ \ \
| * | | | | | EGLConfig is now not remaped to an internal EGLConfigMathias Agopian2012-02-136-261/+54
| * | | | | | remove multiplexing of multiple EGL implementationMathias Agopian2012-02-1310-427/+258
* | | | | | | Merge from masterJean-Baptiste Queru2012-02-141-3/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge "disable cpu_upload path workaround"Guang Zhu2012-02-141-3/+0
| |\ \ \ \ \ \ \
| | * | | | | | | disable cpu_upload path workaroundGuang Zhu2012-02-141-3/+0
* | | | | | | | | Merge from masterJean-Baptiste Queru2012-02-142-31/+71
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Build all font files as prebuilts."Ying Wang2012-02-142-31/+71
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Build all font files as prebuilts.Ying Wang2012-02-132-31/+71
* | | | | | | | | Merge from masterJean-Baptiste Queru2012-02-142-31/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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